aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/testProjectTest/app
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-04-18 16:54:55 -0700
committerXavier Ducrohet <xav@android.com>2012-04-20 13:43:53 -0700
commitdedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5 (patch)
tree36fee2660856de7bec3600d4ae398a5e4724d4de /testapps/testProjectTest/app
parent622512420652f1622a8d0ca9b64845e2a0288aa9 (diff)
downloadsdk-dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5.zip
sdk-dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5.tar.gz
sdk-dedd7eacb4e82ff09cc00516ad4ab5edd9f9bab5.tar.bz2
Manifest merger in Ant build.
This merges the manifest of the libraries into the application's manifest. Change-Id: I425e7b75f71d3f50c6422cdb62bb5ec6811ce99d
Diffstat (limited to 'testapps/testProjectTest/app')
-rw-r--r--testapps/testProjectTest/app/AndroidManifest.xml9
1 files changed, 0 insertions, 9 deletions
diff --git a/testapps/testProjectTest/app/AndroidManifest.xml b/testapps/testProjectTest/app/AndroidManifest.xml
index 821ae78..41e6b82 100644
--- a/testapps/testProjectTest/app/AndroidManifest.xml
+++ b/testapps/testProjectTest/app/AndroidManifest.xml
@@ -9,15 +9,6 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" >
- <activity
- android:name="com.android.tests.testprojecttest.lib.LibActivity"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
</application>
</manifest> \ No newline at end of file