| commit | 849b9e58d6775a393f7d86a6305b658c6af9d16f | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 19 01:43:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 01:43:12 2015 +0000 |
| tree | 8a0e68085d59722a210330bb2e3d9a5598a39409 | |
| parent | fc010d00f3d98e0fa35e9dc32f8c07354b12cbb7 [diff] | |
| parent | ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034 [diff] |
am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev * commit 'ce6fb7bba967a9b33e5d3afe60fff66c5b2ca034': Reset fingerprint lockout timer when strong auth is used.