OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
67f4383
68cce39
)
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357
author
Tony Mak
<tonymak@google.com>
Mon, 11 Sep 2017 14:28:44 +0000
(14:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Sep 2017 14:28:44 +0000
(14:28 +0000)
am:
68cce397b3
Change-Id: Ieb10d27e72646260f0c75535485a6fe11efe2a32
1
2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge
OSDN Git Service
