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)
committerAdam Seaton <aseaton@google.com>
Thu, 6 Apr 2017 21:44:48 +0000 (21:44 +0000)
commiteea3ed206e8c05c227d1bb1d57e627064d5275a6
tree2963e9920bfd1d9bdf0a54320d11b0eb4bbc9dce
parent6422e8fb4429936477f2cac82c472e5e4684f26d
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0
(cherry picked from commit f806d65e615b942c268a5f68d44bde9d55634972)
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java