tree 855f01f6f9e5b5044835ac36fd862f9e8459df34
parent 54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481
parent 34411e8fecab310a0402bd77e8fe5a5a488a783a
author Adrian Roos <roosa@google.com> 1441309605 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441309605 +0000

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

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