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:
58736c6
41fa9fe
)
Merge \\"Remove the DMAgent whitelisting\\" into nyc-mr1-dev am: bf6c6b44e1
author
Makoto Onuki
<omakoto@google.com>
Mon, 18 Jul 2016 18:10:36 +0000
(18:10 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 18 Jul 2016 18:10:36 +0000
(18:10 +0000)
am:
41fa9fe0a4
Change-Id: I5bbe059464a8719b92bf16997482382c7de02e99
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