summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2013-04-18 23:56:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-18 23:56:05 +0000
commit5a02663d08a4a52a73a2bd181969cac4a3fb10e1 (patch)
tree73d4ffa3b4a952cab7d62053d6df03e8c960b7c0
parentc884a08e8c450682f3fe83576fb9e89f8337146e (diff)
parentf6878b009ad680630577ed45207d064bc99059ad (diff)
downloadframeworks_base-5a02663d08a4a52a73a2bd181969cac4a3fb10e1.zip
frameworks_base-5a02663d08a4a52a73a2bd181969cac4a3fb10e1.tar.gz
frameworks_base-5a02663d08a4a52a73a2bd181969cac4a3fb10e1.tar.bz2
Merge "Doc change: Eat some permissions group comments." into jb-mr2-dev
-rw-r--r--core/res/AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 104cc91..9668280 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -545,6 +545,7 @@
<!-- =============================================== -->
<!-- Permissions for enabling accessibility features -->
<!-- =============================================== -->
+ <eat-comment />
<!-- Used for permissions that allow requesting certain accessibility features. -->
<permission-group android:name="android.permission-group.ACCESSIBILITY_FEATURES"
@@ -837,6 +838,7 @@
<!-- ==================================================== -->
<!-- Permissions related to changing audio settings -->
<!-- ==================================================== -->
+ <eat-comment />
<!-- Used for permissions that provide direct access to speaker settings
the device. -->
@@ -1276,6 +1278,7 @@
<!-- ==================================================== -->
<!-- Permissions related to changing status bar -->
<!-- ==================================================== -->
+ <eat-comment />
<!-- Used for permissions that change the status bar -->
<permission-group android:name="android.permission-group.STATUS_BAR"
@@ -1294,6 +1297,7 @@
<!-- ==================================================== -->
<!-- Permissions related to accessing sync settings -->
<!-- ==================================================== -->
+ <eat-comment />
<!-- Used for permissions that access the sync settings or sync
related information. -->