OSDN Git Service

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Apr 2019 23:26:01 +0000 (23:26 +0000)
commit3f1d0ccd2df36c3818c5adb7112463501a4a0b64
tree81d1a1a53dd3083ce50d32c0b7f14e050b2571ad
parentd50021f86b2e7116320bec3e16bcf6fa42873a65
parent5d66886b4cd0c8df79ec59984a596e834da9d325
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into nyc-mr1-dev

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf
  Permission Check For DPM.getPermittedAccessibilityServices
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java