f806d65e615b942c268a5f68d44bde9d55634972 - platform/frameworks/base - Git at Google

commit: f806d65e615b942c268a5f68d44bde9d55634972
[log]
author: Andrew Scull <ascull@google.com>
Fri Jan 13 15:28:36 2017 +0000
committer: Adam Seaton <aseaton@google.com>
Tue Mar 21 13:52:40 2017 -0700
tree: 2963e9920bfd1d9bdf0a54320d11b0eb4bbc9dce
parent: 6422e8fb4429936477f2cac82c472e5e4684f26d [diff]

resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev
fix conflict in nyc-mr2-release
Change-Id: I97ef31536cd06495a08a3f94f81df2d1376186e0

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java[diff]

1 file changed

tree: 2963e9920bfd1d9bdf0a54320d11b0eb4bbc9dce