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:
d7330ca
832ccb0
)
Merge "Also inform activity manager that lock task packages changed"
author
Benjamin Franz
<bfranz@google.com>
Wed, 17 Jan 2018 10:47:29 +0000
(10:47 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 17 Jan 2018 10:47:29 +0000
(10:47 +0000)
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