commit 7a8fd23eb239464950b21dcdaf6afda2a90bc502
author The Android Automerger <android-build@android.com> Tue Aug 28 06:34:33 2012 -0700
committer The Android Automerger <android-build@android.com> Tue Aug 28 06:34:33 2012 -0700
tree 3171014a8a73f77c618d8be6a92174a62787e050
parent 4b4404b1d54dfb8fa8a1f695eefaa33b37f602e4
parent 92806bcb329d2c3a2d9b09edb744336d70dea689

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

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 96f5618..281f98b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -14,13 +14,6 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH" />
-    <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.cp" />
-    <uses-permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" />
-    <uses-permission android:name="android.permission.SUBSCRIBED_FEEDS_WRITE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.BIND_DIRECTORY_SEARCH" />