commit 49a6654694cd6447e1ec6210e335af387398c1ce
author The Android Automerger <android-build@android.com> Tue Jul 31 07:35:34 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Jul 31 07:35:34 2012 -0700
tree 7ddaeb531481e3190257f2a60b4ac494dbce1a86
parent ddafaadba3db45071e52391277ca0ac0bf5ce9dd
parent bb09560e3caddb9639e41a34b427679bccc60b98

merge in jb-mr1-release history after reset to jb-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c812fb6..790b39c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <application android:process="android.process.media"
                  android:label="@string/app_label">
         <provider android:name="MediaProvider" android:authorities="media"
-                android:multiprocess="false">
+                android:multiprocess="false" android:exported="true">
             <grant-uri-permission android:pathPrefix="/external/" />
             <path-permission
                     android:pathPrefix="/external/"