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:
7794330
00c7d34
)
am 00c7d34c: am ff89d589: Merge commit \'3b9de0a4\' into manualmerge
author
Craig Mautner
<cmautner@google.com>
Fri, 14 Mar 2014 21:54:52 +0000
(21:54 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 14 Mar 2014 21:54:52 +0000
(21:54 +0000)
* commit '
00c7d34c463e9c3b4b6d5aca1e62b8caeb3fd7b2
':
Show the keyguard if unsecure window on top
1
2
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Simple merge
OSDN Git Service
