am 4cb03801: Merge change Ia74e2b5c into eclair-mr2

Merge commit '4cb03801ebb4ce3c4f1b2d770f1033677446d6ca' into eclair-mr2-plus-aosp

* commit '4cb03801ebb4ce3c4f1b2d770f1033677446d6ca':
  Switched Settings to use the new Gmail permission name space
This commit is contained in:
Paul Westbrook
2009-11-30 10:40:09 -08:00
committed by Android Git Automerger

View File

@@ -2,8 +2,8 @@
package="com.android.settings"
android:sharedUserId="android.uid.system">
<uses-permission android:name="com.google.android.providers.gmail.permission.WRITE_GMAIL" />
<uses-permission android:name="com.google.android.providers.gmail.permission.READ_GMAIL" />
<uses-permission android:name="com.google.android.gm.permission.WRITE_GMAIL" />
<uses-permission android:name="com.google.android.gm.permission.READ_GMAIL" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<uses-permission android:name="android.permission.DEVICE_POWER" />