OSDN Git Service

Merge "Keyguard should wait before restarting FP auth after successful FP auth" into...
authorKevin Chyn <kchyn@google.com>
Wed, 26 Jul 2017 02:27:56 +0000 (02:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 02:27:56 +0000 (02:27 +0000)
am: 192e7ccf45

Change-Id: Ib77387825e02f7579783e0a9e23f5e9d4b7ed537


Trivial merge