tree 2a826b502305ea11c8aafab2b766f16554f7e68c
parent 06e3f87be4ac0ee660e8e597af0d237c158c8a2c
parent b6cf7076321683b53535f2c3a46dbc9b8fedba73
author Julia Reynolds <juliacr@google.com> 1503932913 +0000
committer android-build-merger <android-build-merger@google.com> 1503932913 +0000

Merge "Don't autogrant permissions on managed profiles" into oc-mr1-dev
am: b6cf707632

Change-Id: Id161a3fd805c7554ebb1799a358354e719ebde10