Merge heads

This commit is contained in:
youtaol
2013-02-26 10:51:24 +08:00
parent d740f5a09d
commit da04450a2b
40 changed files with 326 additions and 182 deletions
+4 -4
View File
@@ -16,8 +16,8 @@ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
android:versionCode="63"
android:versionName="2.0.3"
android:versionCode="64"
android:versionName="2.0.4"
package="com.google.android.maps.mytracks" >
<!-- Permission to initialize services -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -93,7 +93,7 @@ limitations under the License.
<uses-permission android:name="com.google.android.maps.mytracks.permission.MAPS_RECEIVE" />
<uses-sdk
android:minSdkVersion="8"
android:targetSdkVersion="16" />
android:targetSdkVersion="17" />
<!-- Required features -->
<uses-feature
android:glEsVersion="0x00020000"
@@ -136,11 +136,11 @@ limitations under the License.
android:smallScreens="true"
android:xlargeScreens="true" />
<application
android:allowBackup="true"
android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
android:hardwareAccelerated="true"
android:icon="@drawable/my_tracks_icon"
android:label="@string/my_tracks_app_name"
android:name="com.google.android.apps.mytracks.MyTracksApplication"
android:theme="@style/ThemeSelector" >
<!-- For data backup -->
<meta-data