| commit | 7ef772713fac5d7b69874f2b972cdec7a60f074b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Aug 18 23:18:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 23:18:36 2015 +0000 |
| tree | d50e3669c2ebd2f42898b30f15fae1c279ced538 | |
| parent | 2591d6ffc60505df0099069877f7913ec30e4460 [diff] | |
| parent | bea9d7b94cfa16da8f257ed705e218b017d459a7 [diff] |
am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev * commit 'bea9d7b94cfa16da8f257ed705e218b017d459a7': Reset fingerprint lockout timer when strong auth is used.