summaryrefslogtreecommitdiffstats
path: root/core/res/AndroidManifest.xml
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2010-06-09 14:47:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-09 14:47:43 -0700
commit1d46191d88ee9262ea05b868d2db5b44ad85fa43 (patch)
treee51b023ccc1a8d12075665dd06b824584f7afb57 /core/res/AndroidManifest.xml
parentfb3a35e586c08c74a8f9a0c332c9e40753c095c5 (diff)
parentb5f9b4f15a5cb060c34f1b8aa16cfee8503af0c7 (diff)
downloadframeworks_base-1d46191d88ee9262ea05b868d2db5b44ad85fa43.zip
frameworks_base-1d46191d88ee9262ea05b868d2db5b44ad85fa43.tar.gz
frameworks_base-1d46191d88ee9262ea05b868d2db5b44ad85fa43.tar.bz2
am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken
Diffstat (limited to 'core/res/AndroidManifest.xml')
-rw-r--r--core/res/AndroidManifest.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 4aff76f..4076891 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1277,9 +1277,6 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="com.android.server.status.UsbStorageActivity"
- android:excludeFromRecents="true">
- </activity>
<activity android:name="com.android.internal.app.ExternalMediaFormatActivity"
android:theme="@style/Theme.Dialog.Alert"
android:excludeFromRecents="true">