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:
332762a
b275a20
)
Fix issue with saving admins before finishing loading. am: f98ed6863a
author
Kenny Guy
<kennyguy@google.com>
Wed, 18 Jan 2017 17:27:10 +0000
(17:27 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 18 Jan 2017 17:27:10 +0000
(17:27 +0000)
am:
b275a205af
Change-Id: I01487d9c39f4e82b63961cdd43df238f2bfd2b89
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