OSDN Git Service

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1
authorAndrew Scull <ascull@google.com>
Fri, 13 Jan 2017 21:25:50 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 21:25:50 +0000 (21:25 +0000)
commit4c349b67aa20d6cc3cd8be80c645fbadc3affc98
tree64a8d89bd95613e6cecbe32101038d9d5486ceb5
parent7dfd0b98438289b0547ac58d8f60d248c5b90613
parent9af145dcc43e26e12ac41a5f705a28eff6f13089
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1
am: 9af145dcc4

Change-Id: I15cb7dbf619355f22f27e81aa1465683bac7e619
core/java/android/app/admin/DevicePolicyManager.java
core/java/android/app/admin/IDevicePolicyManager.aidl
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java