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:
24c7d2b
d0c7378
)
am f13313a0: Merge "Fix 5452698: fix broken logic in reportFailedAttempt() in lockscr...
author
Jim Miller
<jaggies@google.com>
Tue, 18 Oct 2011 22:12:02 +0000
(15:12 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 18 Oct 2011 22:12:02 +0000
(15:12 -0700)
* commit '
f13313a073ad3f3c4e91baa4adbfdec66395065e
':
Fix
5452698
: fix broken logic in reportFailedAttempt() in lockscreen
Trivial merge