| commit | 88da2bfaacaafebdd2e0fb9542386486b9594871 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 13:47:58 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 13:47:58 2014 -0700 |
| tree | 6723df81e6b9b9a55da1a5cfdf540a3ffc48ac35 | |
| parent | 1066fc61a371443e9423f890f6f7615f2d1e4c6c [diff] | |
| parent | ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b [diff] |
am ed529a5a: (-s ours) am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug * commit 'ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b': DO NOT MERGE - Fix keyguard pattern lockout bug