OSDN Git Service

am 19343927: Merge "Permission policies are for profile and device owners" into mnc-dev
authorAmith Yamasani <yamasani@google.com>
Tue, 12 May 2015 21:23:27 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 12 May 2015 21:23:27 +0000 (21:23 +0000)
* commit '19343927c2cce0b8dfdd1df8309ce82c3d39b0d5':
  Permission policies are for profile and device owners


Trivial merge