summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider/res
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2015-07-30 23:58:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-30 23:58:34 +0000
commit135e2ce571fee7d64572454f55151225bcf22464 (patch)
treee4ccb40066ee62d659f780718c8921d93da57062 /packages/SettingsProvider/res
parentee6046add136d4791e71fb17a07076b425b7250c (diff)
parent53c750142332cb33e604266b7c6d09191c32691c (diff)
downloadframeworks_base-135e2ce571fee7d64572454f55151225bcf22464.zip
frameworks_base-135e2ce571fee7d64572454f55151225bcf22464.tar.gz
frameworks_base-135e2ce571fee7d64572454f55151225bcf22464.tar.bz2
am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev
* commit '53c750142332cb33e604266b7c6d09191c32691c': Add OrSelf to privileged permission check.
Diffstat (limited to 'packages/SettingsProvider/res')
0 files changed, 0 insertions, 0 deletions