| commit | 67a92975ac638db3d51ea4978cf78ee207fcceb7 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 13:53:17 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 13:53:17 2014 -0700 |
| tree | 6ad06361a295aa0b56ca2a5fa9c4166341552943 | |
| parent | 00e12e61472d850c00cf1e479fda2b371ead1257 [diff] | |
| parent | 88da2bfaacaafebdd2e0fb9542386486b9594871 [diff] |
am 88da2bfa: am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug * commit '88da2bfaacaafebdd2e0fb9542386486b9594871': DO NOT MERGE - Fix keyguard pattern lockout bug