| commit | ac275cb3d8184e83228899280bb8901e30f3a5f2 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 21:03:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 21:03:15 2014 +0000 |
| tree | 732ab0c516daf60d0bd929b80629f7215b3c3c24 | |
| parent | 6532523652cf16d3e498939965defab4bd22c491 [diff] | |
| parent | 1f3186ee4505997ef3a235f669313236099308f4 [diff] |
am 1f3186ee: (-s ours) am 67a92975: 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 '1f3186ee4505997ef3a235f669313236099308f4': DO NOT MERGE - Fix keyguard pattern lockout bug