tree 83cb759b114b2d40933cf423a0a6d66e53e6c331
parent 51e7edc2233d564f6988de9694da4ee3219fe202
parent 4d3e0f8b33572345e58e41f8540a9d3e3a9d7a35
author Jim Miller <jaggies@google.com> 1442356203 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442356203 +0000

am 4d3e0f8b: am f84e0535: am 0dd1163a: am dca3b2f7: Merge "Add logging to track fingerprint reco but not unlocking" into mnc-dr-dev

* commit '4d3e0f8b33572345e58e41f8540a9d3e3a9d7a35':
  Add logging to track fingerprint reco but not unlocking