Merge heads

2012-08-09 13:32:59 +08:00
parent 61227b2d89
commit f983c93363
28 changed files with 1862 additions and 2088 deletions
@@ -22,6 +22,10 @@ limitations under the License.
  <instrumentation
    android:name="android.test.InstrumentationTestRunner"
    android:targetPackage="com.google.android.maps.mytracks" />
+  
+  <instrumentation
+    android:name="com.google.android.apps.mytracks.endtoendtest.EndToEndTestRunner"
+    android:targetPackage="com.google.android.maps.mytracks" />

  <uses-sdk
    android:minSdkVersion="7"