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:
ac14efc
ad09bcc
)
Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
author
Dianne Hackborn
<hackbod@google.com>
Tue, 30 Oct 2012 23:37:18 +0000
(16:37 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 30 Oct 2012 23:37:19 +0000
(16:37 -0700)
Trivial merge