OSDN Git Service

Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transpare...
authorRubin Xu <rubinxu@google.com>
Tue, 23 Aug 2016 16:07:40 +0000 (16:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 16:07:40 +0000 (16:07 +0000)
commitbd7e2376fc76ac72da566ab013185186416c798b
tree3df37a0b70d2f1938945f9b6082ca8732fc6b66f
parent7425b2d6779244b239bf7323825dc873fa5f76a5
parent7a4ecbac12d3fa8203eae0d5f2e98864eaffa92a
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev
am: 7a4ecbac12

Change-Id: Id5ee904fbde064dba4702cdb9bae99c063d96d94