tree 70f7e42d8c92cff8c5e5b5232b3179e1701c22f7
parent 5ea22216dda8cd13f68f4dc8f405c9809d6c9e37
parent e9338ac35aad34a2b882d73a0f9ca40558057f34
author Jim Miller <jaggies@google.com> 1438232893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438232893 +0000

am e9338ac3: am be869b66: am 30c5da9c: Don\'t call cancel() when fingerprint auth fails

* commit 'e9338ac35aad34a2b882d73a0f9ca40558057f34':
  Don't call cancel() when fingerprint auth fails