| commit | d590516b673e1a319099d8d009706d42a61877e0 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Mar 14 16:32:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 16:32:12 2014 +0000 |
| tree | 147ebdc3659835eed079ec3fa8c4d39445252f80 | |
| parent | 634925222ad4528984bf35b9b2316db9a227d51c [diff] | |
| parent | 70a0ea0e8de981a2a0c3fb296718256a2355ee2d [diff] |
am 70a0ea0e: am 16858164: am cd0d8cb2: Merge "DO NOT MERGE - Fix keyguard pattern lockout bug" into klp-dev * commit '70a0ea0e8de981a2a0c3fb296718256a2355ee2d': DO NOT MERGE - Fix keyguard pattern lockout bug