tree bb58b02ed3d96dd31a0d678b908cfaab235616d7
parent 95179ad4be0377dd9fd35818145f705bcded0d28
parent bd2ad550c5a7c7b7efbe3510f212322fb173b06c
author Adrian Roos <roosa@google.com> 1441310288 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441310288 +0000

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

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