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:
05c679e
f1aea74
)
Merge "DPC should not be allowed to grant development permission" into oc-dev am...
author
Tony Mak
<tonymak@google.com>
Mon, 11 Sep 2017 03:53:03 +0000
(
03:53
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 11 Sep 2017 03:53:03 +0000
(
03:53
+0000)
am:
f1aea743fd
Change-Id: I80e7885580b9ac17eaf8d7f232684b357b1c84da
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