| commit | d4915ab45797dc7ce533656046df983cb0a5d693 | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Mar 18 22:01:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 22:01:50 2014 +0000 |
| tree | aa04ed953ba768dd3ca6227f1617c9f98341018a | |
| parent | 0535a9f7aa5d0f875b06845e9af5f6dbfc5c8a19 [diff] | |
| parent | 0e61ba8b33dec987258da840e0de3c669de1809f [diff] |
am 0e61ba8b: (-s ours) 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 '0e61ba8b33dec987258da840e0de3c669de1809f': DO NOT MERGE - Fix keyguard pattern lockout bug