tree 376cc5b8f7038f72af435053c38f455d4e151d73
parent 1d9a8c58d8a68027eec950875700550600e3e46b
parent 7ef772713fac5d7b69874f2b972cdec7a60f074b
author Jim Miller <jaggies@google.com> 1439947944 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439947944 +0000

am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev

* commit '7ef772713fac5d7b69874f2b972cdec7a60f074b':
  Reset fingerprint lockout timer when strong auth is used.