| commit | a4a1c0d4ee66f85376adbd71800e05b88b60c5b7 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 21:07:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 21:07:28 2014 +0000 |
| tree | 270a4ee02eabe9d46841da5217b4c83eeb29bf1c | |
| parent | 965e5e8520d040ce7e064db665982eb98c626b2b [diff] | |
| parent | ac275cb3d8184e83228899280bb8901e30f3a5f2 [diff] |
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 'ac275cb3d8184e83228899280bb8901e30f3a5f2': DO NOT MERGE - Fix keyguard pattern lockout bug