OSDN Git Service

Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Fri, 11 Aug 2017 17:26:08 +0000 (17:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 11 Aug 2017 17:26:08 +0000 (17:26 +0000)
commit2e7b65f74a087f43f39c969bce74812103745fac
tree337dcea5e203ad92d08ca2edca52f4fb532efd09
parent719d80e6e08acc170bf571f24dd9a2f01b50b9b4
parent8cf5bcdfa7531ee9f5ead37b890f4eee3655dcf6
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
src/com/android/settings/fingerprint/FingerprintSettings.java