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:
8c9e074
35ad165
)
Merge "Revert "Hide power dialog when lockscreen comes and goes."" into oc-dr1-dev...
author
Alison Cichowlas
<asc@google.com>
Wed, 28 Jun 2017 19:30:36 +0000
(19:30 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 28 Jun 2017 19:30:36 +0000
(19:30 +0000)
am:
35ad165b21
Change-Id: I5256c7b22e1014b37b6970aa3376467ed577aed6
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge