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:
1b8b199
a376eed
)
Merge "Triggering quiescent reboot during OTA" into oc-dev am: d9417c53e0
author
Dmitri Plotnikov
<dplotnikov@google.com>
Thu, 25 May 2017 17:00:23 +0000
(17:00 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 25 May 2017 17:00:23 +0000
(17:00 +0000)
am:
a376eed263
Change-Id: I9796f43fc6dd78f40883c154f0e77f5b438e6bd8
1
2
services/core/java/com/android/server/power/PowerManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/power/PowerManagerService.java
Simple merge