tree b962072f23a867d8765e6de9f89f4bf5c2937f4b
parent 1041a58c83c01a17de53a9cefad8d916c0f4d335
parent 5364c5c49e6b47b27ae7c288373982f4ed833ee9
author Lucas Dupin <dupin@google.com> 1565280819 -0700
committer android-build-merger <android-build-merger@google.com> 1565280819 -0700

Merge "Stop face auth requests when users are typing" into qt-qpr1-dev
am: 5364c5c49e

Change-Id: Idfbf507b6c24d517a9e315e63ca61e2fbe3743b7