tree 7c922c642f844ede87446b50b1bb0e6eb85b26d7
parent 468e8e9873d764c090576d70aebf658e3e89bbfe
parent ecba937b005b07d72eadfaf93a200e0b14af2980
author Adrian Roos <roosa@google.com> 1395173832 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395173832 -0700

am ecba937b: DO NOT MERGE - Fix keyguard pattern lockout bug

* commit 'ecba937b005b07d72eadfaf93a200e0b14af2980':
  DO NOT MERGE - Fix keyguard pattern lockout bug