diff options
author | Amith Yamasani <yamasani@google.com> | 2015-04-29 00:16:59 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-29 00:17:00 +0000 |
commit | 7c97a3ddea62a3bd8a95ca51e7b172b209388815 (patch) | |
tree | 5090188b286cccf2ede51c0a2d19c6c87989d42c /libs | |
parent | 1f1b88b22bf2d22a1074785132a976bb83a4a1d8 (diff) | |
parent | d49489b3af01c13d3b13af1cd04d53787185cc0a (diff) | |
download | frameworks_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