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:
d3ad5ce
3514404
)
Merge "DPM.isProvisioningAllowed(ACTION_PROVISION_MANAGED_DEVICE) should return ...
author
Greg Plesur
<plesur@google.com>
Thu, 13 Oct 2016 21:01:59 +0000
(21:01 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 13 Oct 2016 21:02:01 +0000
(21:02 +0000)
1
2
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
Simple merge