OSDN Git Service

Merge "Keyguard should authenticate with FP even after getting valid FP" into oc...
authorKevin Chyn <kchyn@google.com>
Sat, 15 Apr 2017 07:16:41 +0000 (07:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Apr 2017 07:16:41 +0000 (07:16 +0000)
am: 54b5b6d710

Change-Id: Ic865f205b44d3ba1b851b571a69b97c7a393a958


Trivial merge