OSDN Git Service

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969
authorAndrew Scull <ascull@google.com>
Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 21:16:31 +0000 (21:16 +0000)
commit3c9b36482f0120756ddcc3b6fe5f57d3136c7902
treede94363fbe6aa8c540fa719aedd149dd78225837
parent0dfa7b58b8ed608ff0d8c313aff7c37adef445e9
parent3aac3ebee1079ba56afde5d149b0653c891cb5a8
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969
am: 3aac3ebee1

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