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:
6dcc9de
239d74f
)
Merge "Don't wait keyguard drawn if device has no keyguard" am: a6e5165b2c am: 94ec9e3e4b
author
Jorim Jaggi
<jjaggi@google.com>
Fri, 23 Feb 2018 18:33:52 +0000
(18:33 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 23 Feb 2018 18:33:52 +0000
(18:33 +0000)
am:
239d74fa19
Change-Id: I19abbe828a0004888143be02fd6ca834d8013a64
1
2
services/core/java/com/android/server/policy/PhoneWindowManager.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/policy/PhoneWindowManager.java
Simple merge
diff --cc
services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
Simple merge
OSDN Git Service
