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)
commita2da83d30a4a9a793ddc8f8f7ec31cc1ab8e7807
treee2fbacad0b72987a40ee97e3d4b87805832b2f96
parenta63a05362f64fd2aca0340fb19d524db410ca28e
parentbd7e2376fc76ac72da566ab013185186416c798b
Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev am: 7a4ecbac12
am: bd7e2376fc

Change-Id: I07dbf8982e52bf83b111988e50dd0f41b83403cb