tree 0865251cbac3a412d7a60d7149b5270a386bd482
parent 0e228726663bc579f0014a6c73cf63cb7142e56d
parent 5b92de04b7ff9954a50e54a86f11443a904fa547
author Adrian Roos <roosa@google.com> 1441317968 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441317968 +0000

am 5b92de04: am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev

* commit '5b92de04b7ff9954a50e54a86f11443a904fa547':
  Don't disable fingerprint when entering wrong credential