merge heads

This commit is contained in:
Jimmy Shih
2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
+8 -9
View File
@@ -15,16 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:debuggable="true"
package="com.google.android.maps.mytracks.test"
android:versionCode="1"
android:versionName="1.0"
package="com.google.android.maps.mytracks.test" >
<application
android:icon="@android:drawable/sym_def_app_icon"
android:label="My Tracks Tests" >
<uses-library android:name="android.test.runner" />
</application>
android:versionName="1.0" >
<instrumentation
android:name="android.test.InstrumentationTestRunner"
@@ -34,4 +27,10 @@ limitations under the License.
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>