tree b549112b02cfc7b2429730fa77dcdc4140698c33
parent 123fb19dd1be29575dc2c9e3c7cf852f0da2607a
parent 6bd2f87ee4eac554646c5b04c44b6e3402bac84e
author Adrian Roos <roosa@google.com> 1441310850 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441310850 +0000

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

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