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:
119a06c
963cba5
)
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc am: 01f971dcdc
author
Makoto Onuki
<omakoto@google.com>
Thu, 2 Feb 2017 01:15:44 +0000
(
01:15
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Feb 2017 01:15:44 +0000
(
01:15
+0000)
am:
963cba5b5b
Change-Id: I3a1421f656d1a90970eac6156e0840625662fb17
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
OSDN Git Service
