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:
6a48fea
34377e0
)
resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227
author
Tony Mak
<tonymak@google.com>
Mon, 11 Sep 2017 14:17:10 +0000
(14:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Sep 2017 14:17:10 +0000
(14:17 +0000)
am:
34377e0357
Change-Id: Ief87ce5e1dc9e5b424d70e72144084aa778ca0d6
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
