tree b7712a8d6170de3d9131ca5d32caa20551b2d834
parent 256718bc72e38b26c6c6b4e8dee78f80dcd2ae4d
parent ac1da4816b360028eb0185ac984f1ffaa79fdb18
author Jim Miller <jaggies@google.com> 1441261411 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441261411 +0000

am ac1da481: am f873f9ab: am bd5b61c4: Merge "Fingerprint should throttle after 5 attempts" into mnc-dr-dev

* commit 'ac1da4816b360028eb0185ac984f1ffaa79fdb18':
  Fingerprint should throttle after 5 attempts