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:
cb5642a
ddcdecc
)
Keyguard: Improve trusted unlock while occluded
author
Adrian Roos
<roosa@google.com>
Fri, 5 Aug 2016 18:46:15 +0000
(18:46 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 5 Aug 2016 18:46:15 +0000
(18:46 +0000)
am:
ddcdecc952
Change-Id: I090d266a7a48e85eee669f13ff595407565d18ff
1
2
services/core/java/com/android/server/policy/PhoneWindowManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge