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:
885a134
53a39ea
)
Merge "Handle showWhenLocked on secondary displays"
author
David Stevens
<stevensd@google.com>
Tue, 19 Sep 2017 18:13:46 +0000
(18:13 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 19 Sep 2017 18:13:46 +0000
(18:13 +0000)
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/am/ActivityStack.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
diff --cc
services/core/java/com/android/server/am/ActivityStack.java
Simple merge
diff --cc
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
Simple merge
OSDN Git Service
