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
This commit is contained in:
Rubin Xu
2016-08-23 18:30:14 +00:00
committed by android-build-merger

Diff Content Not Available