commit 2d67570137f68247291dd6ac9fbaee8595065d41
author Santos Cordon <santoscordon@google.com> Wed Sep 04 21:27:51 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 04 21:27:52 2013 +0000
tree a89afdca28f8423eaf16a0ac22bbfea8ffa15797
parent 2fa09cdb962c350a5c269e6c25730b3f241b51dd
parent ba83aec43914322a225ec26f72ce11f190ac0223

Merge "Combine InCallUI & Dialer (part 4)" into klp-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ee3a23b..8b25074 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -51,7 +51,6 @@
     <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
-    <uses-permission android:name="android.permission.ADD_SYSTEM_SERVICE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -87,7 +86,6 @@
     <uses-permission android:name="android.permission.REBOOT" />
     <uses-permission android:name="android.permission.UPDATE_LOCK" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="com.android.smspush.WAPPUSH_MANAGER_BIND" />
     <uses-permission android:name="android.permission.MANAGE_USERS" />
     <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
     <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />