am 4967a11f: am 74b0f5ac: Merge "Let Shell modify secondary external storage." into klp-dev

* commit '4967a11f8c7d166e3c39fe1c1fd75dec41901eec':
  Let Shell modify secondary external storage.
This commit is contained in:
Jeff Sharkey
2013-11-05 13:56:51 -08:00
committed by Android Git Automerger

View File

@@ -5,7 +5,6 @@
>
<!-- Standard permissions granted to the shell. -->
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.SEND_SMS" />
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -64,6 +63,7 @@
<uses-permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
<uses-permission android:name="android.permission.MANAGE_USERS" />