commit | bb6856b71e2de27551d64d40229e295c605fc845 | [log] [tgz] |
---|---|---|
author | Kevin Chyn <kchyn@google.com> | Wed Jul 26 02:40:27 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jul 26 02:40:27 2017 +0000 |
tree | 326a6e1c7955c5602658678ca0da654dcba49ad3 | |
parent | 513125a7e3a7525e61823b78cce4085a2208a8f4 [diff] | |
parent | af35c76897c5f91aa2e10cb344330b2a88f6bec1 [diff] |
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am: 192e7ccf45 am: af35c76897 Change-Id: If0df54f19b6eee4975c378e2ec647c76387df93e