summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-05-27 17:48:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-27 17:48:14 +0000
commit4bb35da6cecc18f6f968f6de4264dd8dd69f6fb9 (patch)
tree9cf5175c16be6e2cf2de2cf9c9f84b31ed266db8 /core/res
parentd68200c66b775ae991e9217dd021ef3713f4cc8e (diff)
parent17f3f16c4f50b5db362d418cc601788ae4175179 (diff)
downloadframeworks_base-4bb35da6cecc18f6f968f6de4264dd8dd69f6fb9.zip
frameworks_base-4bb35da6cecc18f6f968f6de4264dd8dd69f6fb9.tar.gz
frameworks_base-4bb35da6cecc18f6f968f6de4264dd8dd69f6fb9.tar.bz2
Merge "Remove airplane, bugreport, and ringer mode global actions." into lmp-preview-dev
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5375c14..e9d8ccc 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1538,9 +1538,6 @@
-->
<string-array translatable="false" name="config_globalActionsList">
<item>power</item>
- <item>airplane</item>
- <item>bugreport</item>
- <item>silent</item>
<item>users</item>
</string-array>