summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-11 19:13:33 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-11 19:13:33 -0700
commitffbc4b948d0214c28df382f9eb209ea8f5ceef83 (patch)
tree3681db17c432008369ae3c22a11c949b5bef8c7e /core
parentde846ac659e8c14d898a3fa14bd0504b24096057 (diff)
parentd39d515b9110d7405d0f03dbf612ba5c9b8ac566 (diff)
downloadframeworks_base-ffbc4b948d0214c28df382f9eb209ea8f5ceef83.zip
frameworks_base-ffbc4b948d0214c28df382f9eb209ea8f5ceef83.tar.gz
frameworks_base-ffbc4b948d0214c28df382f9eb209ea8f5ceef83.tar.bz2
Merge "Fix SD card mounting issues #3074555 and #3072332" into gingerbread
Diffstat (limited to 'core')
-rw-r--r--core/res/AndroidManifest.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 9d914ad..43eeda8 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1332,10 +1332,6 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
- <activity android:name="com.android.internal.app.ExternalMediaFormatActivity"
- android:theme="@style/Theme.Dialog.Alert"
- android:excludeFromRecents="true">
- </activity>
<activity android:name="android.accounts.ChooseAccountActivity"
android:excludeFromRecents="true"