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:
db69b25
b1888aa
)
Merge "Don't resume until keyguard is gone"
author
Andrii Kulian
<akulian@google.com>
Wed, 21 Feb 2018 16:19:45 +0000
(16:19 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 21 Feb 2018 16:19:45 +0000
(16:19 +0000)
1
2
services/core/java/com/android/server/am/ActivityRecord.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityRecord.java
Simple merge
OSDN Git Service
