tree 5e12b5e5fb822154cee553e8ce3ecce5afa1d342
parent b0eae7ee801bab959699230c5d9094a786f37a72
parent 189294e26bb5ba350dab63871da25a9368397953
author Nicolas Prevot <nprevot@google.com> 1429888129 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429888132 +0000

Merge "Give MANAGE_PROFILE_AND_DEVICE_OWNERS to Settings."