tree ed09545e71c446dfe507ff58af4525a4190d614a
parent 6cdd5fccd89733a4f21c650109d81b3459ad6e58
parent da9f9a0fab1144bbd376d9d20f389f9d42c6b96e
author Rubin Xu <rubinxu@google.com> 1471957156 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471957157 +0000

Merge "Do not require MANAGE_DEVICE_ADMINS for showing admin-specifc policy transparency dialog" into nyc-mr1-dev