summaryrefslogtreecommitdiffstats
path: root/res/values-fa
diff options
context:
space:
mode:
authorAlex Chau <alexchau@google.com>2015-07-06 19:24:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-06 19:24:23 +0000
commit138c8e112d1300b0ccee2f4bf3b6d55ee1854c38 (patch)
tree1df51e5e14b9f8894cef4178b07e44175d794de7 /res/values-fa
parentcde219fbcfcd83a9e86ff8a16950611dcdcb7ca3 (diff)
parent56e7492fd253ce3d2218adb8f4fe237e2f6a4ad9 (diff)
downloadandroid_packages_apps_PackageInstaller-138c8e112d1300b0ccee2f4bf3b6d55ee1854c38.tar.gz
android_packages_apps_PackageInstaller-138c8e112d1300b0ccee2f4bf3b6d55ee1854c38.tar.bz2
android_packages_apps_PackageInstaller-138c8e112d1300b0ccee2f4bf3b6d55ee1854c38.zip
am 56e7492f: am 7c60f308: am 3dd1feb6: am 695b6f3f: am fa14b807: Merge "Display explanatory text in \'App permissions\' settings when permissions policies are enforced" into mnc-dev
* commit '56e7492fd253ce3d2218adb8f4fe237e2f6a4ad9': Display explanatory text in 'App permissions' settings when permissions policies are enforced
Diffstat (limited to 'res/values-fa')
0 files changed, 0 insertions, 0 deletions