Merge heads

2012-06-20 09:45:23 +08:00
parent f1a3c5dffa
commit 978b6c5a09
123 changed files with 2475 additions and 5323 deletions
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  android:installLocation="auto"
-  android:versionCode="43"
+  android:versionCode="44"
  android:versionName="2.0"
  package="com.google.android.maps.mytracks" >

@@ -126,6 +126,7 @@ limitations under the License.
  <application
    android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
    android:icon="@drawable/my_tracks_icon"
+    android:hardwareAccelerated="true"
    android:label="@string/my_tracks_app_name"
    android:name="com.google.android.apps.mytracks.MyTracksApplication"
    android:theme="@style/ThemeSelector" >