OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f328b0
51e2439
)
Merge "Fix 5026428: Rework unlock attempt logic with active DPM to show better messages"
author
Jim Miller
<jaggies@google.com>
Mon, 22 Aug 2011 20:36:07 +0000
(13:36 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 22 Aug 2011 20:36:07 +0000
(13:36 -0700)
Trivial merge