OSDN Git Service

Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
authorKevin Chyn <kchyn@google.com>
Fri, 11 Aug 2017 17:34:35 +0000 (17:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 Aug 2017 17:34:35 +0000 (17:34 +0000)
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c


Trivial merge