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:
4e779ec
ca0a124
)
Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev
author
Craig Mautner
<cmautner@google.com>
Tue, 2 Dec 2014 21:13:58 +0000
(21:13 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 2 Dec 2014 21:14:00 +0000
(21:14 +0000)
Trivial merge