OSDN Git Service

resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227
authorTony Mak <tonymak@google.com>
Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Sep 2017 14:17:10 +0000 (14:17 +0000)
commit68cce397b312b07eb58c1b46f6a243a7b433a188
tree1974c8c2e93db90bbfc88f8220fa9c17224f702f
parent6a48feaab87c3df889a4228fec0ca0c65311e9f6
parent34377e035775839b700876ea8b6d870c63bc985d
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227
am: 34377e0357

Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java