| commit | 4ea5152bd8b7f046562901b5dfc2ca917dbd987b | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 19 02:21:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 19 02:21:58 2015 +0000 |
| tree | 728947af7145c00173da58b431eab63c107601d2 | |
| parent | 2af1b3caaa2687d30ae60a2b67b729588dc5d476 [diff] | |
| parent | 849b9e58d6775a393f7d86a6305b658c6af9d16f [diff] |
am 849b9e58: am ce6fb7bb: am 7ef77271: am bea9d7b9: Merge "Reset fingerprint lockout timer when strong auth is used." into mnc-dr-dev * commit '849b9e58d6775a393f7d86a6305b658c6af9d16f': Reset fingerprint lockout timer when strong auth is used.