From: Kevin Chyn <kchyn@google.com>
Date: Fri, 11 Aug 2017 17:34:35 +0000 (+0000)
Subject: Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
X-Git-Tag: android-x86-9.0-r1~218^2~1^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e8f4b6320abaadb012656e81f400008df29802b;p=android-x86%2Fpackages-apps-Settings.git

Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am: 2e7b65f74a

Change-Id: I20ab95a2a6b677ac04cd46dbf89775f1cd8f071c
---

5e8f4b6320abaadb012656e81f400008df29802b