am 179a7d76: am 4cb03801: Merge change Ia74e2b5c into eclair-mr2

Merge commit '179a7d76ea1921099d012bda6f373e7765abbcdd'

* commit '179a7d76ea1921099d012bda6f373e7765abbcdd':
  Switched Settings to use the new Gmail permission name space
This commit is contained in:
Paul Westbrook
2009-12-01 09:07:35 -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" />