OSDN Git Service

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
authorAndrew Scull <ascull@google.com>
Fri, 13 Jan 2017 17:17:49 +0000 (17:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jan 2017 17:17:49 +0000 (17:17 +0000)
commit3aac3ebee1079ba56afde5d149b0653c891cb5a8
tree0dd8bb5752c8cfaedd54f30501d6ff0be89d001b
parent331a4bb8d464aebddad5ec04a27526ef1384cbd5
parenteb35ad9969a173ac4d6279a5e322e8176c2ae6d1
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
am: eb35ad9969

Change-Id: I4fd9ce4c79db5a10f28008c89205fc9c8ef2888f
services/core/java/com/android/server/LockSettingsService.java
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java