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:
ea5586e
468e8e9
)
am 468e8e98: am 1f52437d: Show the keyguard if unsecure window on top
author
Craig Mautner
<cmautner@google.com>
Thu, 13 Mar 2014 17:51:39 +0000
(10:51 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 13 Mar 2014 17:51:39 +0000
(10:51 -0700)
* commit '
468e8e9873d764c090576d70aebf658e3e89bbfe
':
Show the keyguard if unsecure window on top
Trivial merge