| commit | 0e61ba8b33dec987258da840e0de3c669de1809f | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 21:56:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 21:56:35 2014 +0000 |
| tree | eaf88b6c43acf1613ff6abcfc03fa4a0c247d674 | |
| parent | 06fe82d8e01780b7b6c16364f81f8dd75d467420 [diff] | |
| parent | 546f0c9c2cc902ebe30fef79b34e93eac8542e14 [diff] |
am 546f0c9c: 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 '546f0c9c2cc902ebe30fef79b34e93eac8542e14': DO NOT MERGE - Fix keyguard pattern lockout bug