| commit | ed529a5a78ade4833a8fd2ddfaf88d68ca260e6b | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 13:41:20 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 13:41:20 2014 -0700 |
| tree | b5e0a5878ff92e7534bbcee223041a783cfdb6a9 | |
| parent | ad63d91439b3617a3d2ba9f1696ac7a27b5f9389 [diff] | |
| parent | 500ec9ce4b7856eca480c4c7dca8df1211614102 [diff] |
am 500ec9ce: am 25fb7133: am 0b2f2122: am d3da8f71: am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug * commit '500ec9ce4b7856eca480c4c7dca8df1211614102': DO NOT MERGE - Fix keyguard pattern lockout bug