OSDN Git Service

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
authorAndrew Scull <ascull@google.com>
Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)
committerAndrew Scull <ascull@google.com>
Fri, 13 Jan 2017 15:28:36 +0000 (15:28 +0000)
commiteb35ad9969a173ac4d6279a5e322e8176c2ae6d1
tree4d1d76039a5077dee84f33f45ed0871e2452e8fb
parent1f99f81bdc5e8430717def157f4abe1176d6a88e
parentad4aa1ce7d3dd2dd8d5690eb2f7653ca3c27000e
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev

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