tree 83e8222843d23980f107e9405204d38820232faf
parent 4f8dc822102a8b138d980cabff35ad3ac28ebb96
parent 25a6cfe9b561c472bf39a0512368f6242e1b48f0
author Sudheer Shanka <sudheersai@google.com> 1458760841 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458760841 +0000

Merge "Remove manage_device_admins and manage_profile_and_device_owner permissions." into nyc-dev