summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2016-03-28 22:33:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-28 22:33:12 +0000
commit41e78d81b5d2c64c51502ac28fbe00314d4ea57d (patch)
treeb2c031ef3b25f27d6698217d2e70c798b10538e6 /res
parent34e7e6c097a4182af9db4e42ec5c66c5c781231b (diff)
parent895caebccb2ddad703b087baac757f5dcb5822ab (diff)
downloadandroid_packages_apps_PackageInstaller-41e78d81b5d2c64c51502ac28fbe00314d4ea57d.tar.gz
android_packages_apps_PackageInstaller-41e78d81b5d2c64c51502ac28fbe00314d4ea57d.tar.bz2
android_packages_apps_PackageInstaller-41e78d81b5d2c64c51502ac28fbe00314d4ea57d.zip
Merge "Increase char limit for uninstall_blocked_profile_owner" into nyc-dev
am: 895caeb * commit '895caebccb2ddad703b087baac757f5dcb5822ab': Increase char limit for uninstall_blocked_profile_owner
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb1f38ab..dd755f5f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -125,7 +125,7 @@
<string name="uninstall_failed_device_policy_manager_of_user">Can\'t uninstall because this package is an
active device administrator for the user <xliff:g id="username">%1$s</xliff:g>.</string>
<!-- String presented to the user when uninstalling a package failed because a profile owner
- has marked the the target package as not able to be uninstalled [CHAR LIMIT=80] -->
+ has marked the the target package as not able to be uninstalled [CHAR LIMIT=120] -->
<string name="uninstall_blocked_profile_owner">This app is required for some users or profiles
and was uninstalled for others</string>
<!-- String presented to the user when uninstalling a package failed because a device owner