commit fecb4ab65d302fe885997519318da30ada1a8f44
author Scott Su Sat Apr 18 14:35:15 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Sat Apr 18 14:35:15 2009 -0700
tree 12e9231fcb2640624366468e4be98dec86469ec4
parent 0060262f0d0d6c9f4b34b146460d422dc74ee2c2

AI 146523: am: CL 146090 am: CL 146089 CTS: add test cases for android.app.AliasActivity
  Original author: sus
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146523

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index efe219a..100caaf 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -359,6 +359,14 @@
             <data android:mimeType="vnd.android.cursor.dir/person" />
         </activity>
 
+       <activity android:name="android.app.cts.AliasActivityStub">
+             <meta-data android:name="android.app.alias"
+                android:resource="@xml/alias" />
+       </activity>
+
+       <activity android:name="android.app.cts.ChildActivity"
+                        android:label="ChildActivity" />
+ 
     </application>
 
 </manifest>