merge heads

MyTracksTest/AndroidManifest.xml

@@ -1,14 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.google.android.maps.mytracks.test"
-      android:versionCode="1"
-      android:versionName="1.0"
-      android:debuggable="true">
-    <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" />
-    </application>
-    <instrumentation android:targetPackage="com.google.android.maps.mytracks"
-                     android:name="android.test.InstrumentationTestRunner" />
+  package="com.google.android.maps.mytracks.test"
+  android:versionCode="1"
+  android:versionName="1.0" >
+
+  <instrumentation
+    android:name="android.test.InstrumentationTestRunner"
+    android:targetPackage="com.google.android.maps.mytracks" />
+
+  <uses-sdk
+    android:minSdkVersion="7"
+    android:targetSdkVersion="15" />
+
+  <application
+    android:icon="@android:drawable/sym_def_app_icon"
+    android:label="My Tracks Tests" >
+    <uses-library android:name="android.test.runner" />
+  </application>
+
 </manifest>