diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-07-25 00:32:47 +0100 |
commit | f587ad6fd760c78eae8fe7a59104f43a7ea84f3d (patch) | |
tree | 1c8f9d691d69b893902c7c2d467a3df0555b2615 /res/values-rm/strings.xml | |
parent | a4b300d057b74e848de622c33c2206281d0df631 (diff) | |
parent | b1a5960af6814e38ae7dcd771d25c1d8ab1dcae6 (diff) | |
download | android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.gz android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.tar.bz2 android_packages_apps_PackageInstaller-f587ad6fd760c78eae8fe7a59104f43a7ea84f3d.zip |
Merge tag 'android-4.3_r2.1' into cm-10.2
Android 4.3 release 2.1
Conflicts:
res/values-nl/strings.xml
Change-Id: I6b4a88abd08a4a2f2cecbc4ea5b86bbc736d2dd6
Diffstat (limited to 'res/values-rm/strings.xml')
-rw-r--r-- | res/values-rm/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml index 1d677210..dded8e04 100644 --- a/res/values-rm/strings.xml +++ b/res/values-rm/strings.xml @@ -126,4 +126,6 @@ <skip /> <!-- no translation found for no_new_perms (6657813692169565975) --> <skip /> + <!-- no translation found for grant_confirm_question (4690289297029223742) --> + <skip /> </resources> |