| commit | 546f0c9c2cc902ebe30fef79b34e93eac8542e14 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 21:51:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 21:51:44 2014 +0000 |
| tree | df0967086e6a9f31c28ae139d0c5fd2a85e2b093 | |
| parent | 2e6d960c85436b46f71a048a825c545a376fbf06 [diff] | |
| parent | 2d70a47b0e7196a58561195fc47a57085cf29633 [diff] |
am 2d70a47b: am a4a1c0d4: am ac275cb3: 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 '2d70a47b0e7196a58561195fc47a57085cf29633': DO NOT MERGE - Fix keyguard pattern lockout bug