OSDN Git Service

Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 10 Apr 2019 23:26:00 +0000 (23:26 +0000)
commit07a485743ad170d5491383a8c5909ced14bb0930
tree64407e1673c704cec02630fdd2e2083f8b2930d3
parent2256fd4e1113126bf85d0ee03197c1bd0f27e7bb
parenta7c959176c5abfcd402d5350661237b81dfac4ff
Merge changes from topic "am-09249f80-e618-46fc-ac06-c7fdc73c36ae" into oc-dev

* changes:
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c am: 0f19d41748
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c am: 75b579135c
  [automerger] Permission Check For DPM.getPermittedAccessibilityServices am: 4fd13eefcf am: 39eef269be am: 5d66886b4c
  [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