OSDN Git Service

Merge "Permission Check For DPM Get IME API" into pi-dev
authorEric Sandness <sandness@google.com>
Thu, 29 Mar 2018 08:25:09 +0000 (08:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 29 Mar 2018 08:25:09 +0000 (08:25 +0000)
commit78931a0f95a9406029eda9f438321d8087206966
tree1b29297bccf648ffc8cfe1f41b49e1cbea0f069b
parentd598caacfc818400c20f8aab471de87c515eb74d
parent57378939c51541166ea670c1ddea963bd04a567e
Merge "Permission Check For DPM Get IME API" into pi-dev
core/java/android/app/admin/DevicePolicyManager.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java