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