| commit | afcc9575546666f43bb839e98d914a48a42fd329 | [log] [tgz] |
|---|---|---|
| author | Kevin Chyn <kchyn@google.com> | Fri Aug 11 17:49:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 11 17:49:51 2017 +0000 |
| tree | 92a04b73511087be3f718d9e062fc3eb41e0ea21 | |
| parent | ceb18985bc87bb769634e7ba3ad8d0aa544641bc [diff] | |
| parent | 4b7539e42bcd42339650a4ef3eac45af3a3c4d22 [diff] |
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am: 60409a9255 am: 4b7539e42b Change-Id: Ib778ed967d874e3eb4ccc3645adcc5d38c08996f