summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-07-17 01:31:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-17 01:31:41 +0000
commitd328a74dc68a48014eaca3557d197957cadc7731 (patch)
tree2e5897625169b832879c2dcb469128d95657f1f1 /res/values
parent058a12293c71eb5d6f8633d5d17d94b7d2e334d1 (diff)
parent7e83ec77ba2334b79423d876e4ee4ea049d022a3 (diff)
downloadandroid_packages_apps_PackageInstaller-d328a74dc68a48014eaca3557d197957cadc7731.tar.gz
android_packages_apps_PackageInstaller-d328a74dc68a48014eaca3557d197957cadc7731.tar.bz2
android_packages_apps_PackageInstaller-d328a74dc68a48014eaca3557d197957cadc7731.zip
am 7e83ec77: am 8cee73b1: am 9c952ae1: am 50c7b52d: am 4bb2c78d: Merge "Remove the obsolete \'show legacy\' option from permission screens" into mnc-dev
* commit '7e83ec77ba2334b79423d876e4ee4ea049d022a3': Remove the obsolete 'show legacy' option from permission screens
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 0 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 30eda5b0..f0b80e05 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -221,12 +221,6 @@
<!-- Warning for turning off permissions on older apps -->
<string name="old_sdk_deny_warning">This app was designed for an older version of Android. Denying permission may cause it to no longer function as intended.</string>
- <!-- Label for the menu option to show legacy permissions [CHAR LIMIT=40] -->
- <string name="show_legacy_permissions">Show legacy</string>
-
- <!-- Label for the menu option to hide legacy permissions [CHAR LIMIT=40] -->
- <string name="hide_legacy_permissions">Hide legacy</string>
-
<!-- The default description of a permission, i.e. what it does. [CHAR LIMIT=40] -->
<string name="default_permission_description">perform an unknown action</string>