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:
3366d4b
01f971d
)
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 2317451acc
author
Makoto Onuki
<omakoto@google.com>
Thu, 2 Feb 2017 01:10:43 +0000
(
01:10
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 2 Feb 2017 01:10:43 +0000
(
01:10
+0000)
am:
01f971dcdc
Change-Id: If5f5e5d47b97e2b8480adc5ca2cb08702056ca87
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
