summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2015-04-29 00:16:59 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-29 00:17:00 +0000
commit7c97a3ddea62a3bd8a95ca51e7b172b209388815 (patch)
tree5090188b286cccf2ede51c0a2d19c6c87989d42c /libs
parent1f1b88b22bf2d22a1074785132a976bb83a4a1d8 (diff)
parentd49489b3af01c13d3b13af1cd04d53787185cc0a (diff)
downloadframeworks_base-7c97a3ddea62a3bd8a95ca51e7b172b209388815.zip
frameworks_base-7c97a3ddea62a3bd8a95ca51e7b172b209388815.tar.gz
frameworks_base-7c97a3ddea62a3bd8a95ca51e7b172b209388815.tar.bz2
Merge "Permissions control via profile/device owner admin" into mnc-dev
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions