merge heads

2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -3,7 +3,7 @@
      package="com.google.android.apps.mytracks.samples.api"
      android:versionCode="1"
      android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="3"/>
+    <uses-sdk android:minSdkVersion="7"/>

    <application android:icon="@drawable/icon"
                 android:label="@string/app_name">