tree 07ae00307a80d747dce670622bd11f5179a2470f
parent 3b9de0a429910cd66e5360b279328778bb710083
parent 67a92975ac638db3d51ea4978cf78ee207fcceb7
author Adrian Roos <roosa@google.com> 1395176368 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395176368 -0700

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