merge heads

2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -6,7 +6,7 @@
  <application android:label="Signal Strenght Sampler Test">
    <uses-library android:name="android.test.runner" />
  </application>
-  <uses-sdk android:minSdkVersion="3" />
+  <uses-sdk android:minSdkVersion="7" />
  <instrumentation android:targetPackage="com.google.android.apps.mytracks.signalstrength"
                   android:name="android.test.InstrumentationTestRunner" />
 </manifest>