tree 732ab0c516daf60d0bd929b80629f7215b3c3c24
parent 6532523652cf16d3e498939965defab4bd22c491
parent 1f3186ee4505997ef3a235f669313236099308f4
author Adrian Roos <roosa@google.com> 1395176595 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395176595 +0000

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 '1f3186ee4505997ef3a235f669313236099308f4':
  DO NOT MERGE - Fix keyguard pattern lockout bug