summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-05-04 17:25:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-04 17:25:01 +0000
commitc2bdb7bd4204a9eae7381b1b9e8e6ef1e3799b9c (patch)
tree8cbbf7214e7d9868b446bba74985a1f3b11c1032 /apps
parentdd6195cf27a07c04e6b21f6e339f4fbbdd28a81e (diff)
parent4a2828c6d29c47421473bdf671c67499130c1e02 (diff)
downloadandroid_development-c2bdb7bd4204a9eae7381b1b9e8e6ef1e3799b9c.tar.gz
android_development-c2bdb7bd4204a9eae7381b1b9e8e6ef1e3799b9c.tar.bz2
android_development-c2bdb7bd4204a9eae7381b1b9e8e6ef1e3799b9c.zip
am 4a2828c6: Merge "Fix ActivityNotFound Exception in Dev Tools"
* commit '4a2828c6d29c47421473bdf671c67499130c1e02': Fix ActivityNotFound Exception in Dev Tools
Diffstat (limited to 'apps')
-rw-r--r--apps/Development/AndroidManifest.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/Development/AndroidManifest.xml b/apps/Development/AndroidManifest.xml
index 3ac819077..52aad2c5c 100644
--- a/apps/Development/AndroidManifest.xml
+++ b/apps/Development/AndroidManifest.xml
@@ -66,6 +66,8 @@
</activity>
<activity android:name="PackageSummary" android:label="Package Summary">
</activity>
+ <activity android:name="ShowActivity" android:label="Activity Detail">
+ </activity>
<activity android:name="AppPicker"
android:theme="@android:style/Theme.Dialog">
</activity>