tree 2626bd0f3836bc7b6ec561b3e50e5b94ad20a570
parent 631ef2c0a1ba0f447c9ab659e077ec48ad21ef91
parent 7324404514f3f2865f1a992da37fba2bb73fa838
author Benjamin Franz <bfranz@google.com> 1436373232 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436373232 +0000

am 73244045: am e5bed3b3: Merge "Extend Managed Profile permissions tests" into mnc-dev

* commit '7324404514f3f2865f1a992da37fba2bb73fa838':
  Extend Managed Profile permissions tests