OSDN Git Service

Merge "DPC should not be allowed to grant development permission" into oc-dev
authorTony Mak <tonymak@google.com>
Mon, 11 Sep 2017 03:41:57 +0000 (03:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 03:41:57 +0000 (03:41 +0000)
commitf1aea743fdb16b3601e44cc11192a9506f4e231f
tree4ffc9601f7f90ba6980c7448179d090e98c42eef
parenta8e0d5f73a6c8e144dee5f1b0ac9e3323163ce36
parent5e4b2b15ecd8e0c98ee44c497c862900464f68f6
Merge "DPC should not be allowed to grant development permission" into oc-dev
am: 5e4b2b15ec

Change-Id: I54c0be2c389aacb367b3c8c7e749475dced25f3c
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java