| commit | 5313f2c783de49b8ebbd320458a182f0da824593 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Mar 14 17:53:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 17:53:36 2014 +0000 |
| tree | a0caad18b202db502ef9a617a01bce3f54ab8305 | |
| parent | 9cd1e9da9c64e8d9fe99497153ce319c05c12e52 [diff] | |
| parent | 1b2a09d4d42e7a2406ac9c25b7cedd8880f25643 [diff] |
am 1b2a09d4: (-s ours) am d590516b: am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev * commit '1b2a09d4d42e7a2406ac9c25b7cedd8880f25643': DO NOT MERGE - Fix keyguard pattern lockout bug