tree 326a6e1c7955c5602658678ca0da654dcba49ad3
parent 513125a7e3a7525e61823b78cce4085a2208a8f4
parent af35c76897c5f91aa2e10cb344330b2a88f6bec1
author Kevin Chyn <kchyn@google.com> 1501036827 +0000
committer android-build-merger <android-build-merger@google.com> 1501036827 +0000

Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am: 192e7ccf45
am: af35c76897

Change-Id: If0df54f19b6eee4975c378e2ec647c76387df93e