tree 3334efddabb727be3400b5474685923435f8aaf2
parent 829359163dd8c26232627e781ef30ab1373d4463
parent be869b667142d3dc8723f19951b4d6ba2c055b24
author Jim Miller <jaggies@google.com> 1438232159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438232159 +0000

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

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