merge heads

2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -4,7 +4,7 @@
      android:versionCode="1"
      android:versionName="1.0"
      android:debuggable="true">
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="7" />
    <application android:icon="@android:drawable/sym_def_app_icon"
                 android:label="My Tracks Tests">
      <uses-library android:name="android.test.runner" />