diff options
| author | Alex Chau <alexchau@google.com> | 2015-07-06 16:14:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 16:14:43 +0000 |
| commit | fa14b80793711f72f190fef5a41228776b97e6a0 (patch) | |
| tree | 681b03ad5bf3676dcb4661e2c6d548bfdaad86ab /res | |
| parent | 01fd766a6a53d62f772f0b9da32655977354f1eb (diff) | |
| parent | 97dcbacc147a622d267b81b7cc68ff4a5c0c6ddf (diff) | |
| download | android_packages_apps_PackageInstaller-fa14b80793711f72f190fef5a41228776b97e6a0.tar.gz android_packages_apps_PackageInstaller-fa14b80793711f72f190fef5a41228776b97e6a0.tar.bz2 android_packages_apps_PackageInstaller-fa14b80793711f72f190fef5a41228776b97e6a0.zip | |
Merge "Display explanatory text in 'App permissions' settings when permissions policies are enforced" into mnc-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 47cea64d..f71dfe99 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -250,4 +250,7 @@ <!-- [CHAR LIMIT=NONE] Warning message when turning off permission for system apps --> <string name="system_warning">If you deny this permission, basic features of your device may no longer function as intended.</string> + <!-- [CHAR LIMIT=NONE] Summary of a permission switch when it's enforced by policy --> + <string name="permission_summary_enforced_by_policy">Enforced by policy</string> + </resources> |