merge heads

This commit is contained in:
Jimmy Shih
2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ limitations under the License.
<uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
<uses-feature android:name="android.hardware.telephony" android:required="true"/>
<uses-feature android:name="android.hardware.telephony.gsm" android:required="false"/>
<uses-sdk android:minSdkVersion="3" />
<uses-sdk android:minSdkVersion="7" />
<supports-screens android:xlargeScreens="true"
android:largeScreens="true"
android:normalScreens="true"