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 18:30:14 +0000 (18:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 18:30:14 +0000 (18:30 +0000)
am: bd7e2376fc

Change-Id: I07dbf8982e52bf83b111988e50dd0f41b83403cb


Trivial merge