tree 38eec5403ca9f05f178eab0446932356533f6c04
parent 6291841e96b7542582445902c3ef61d2cee005a6
parent aaefd55aa50081aad1c87bb8ecaa8ed7394dff0f
author Bill Richardson <wfrichar@google.com> 1564786833 -0700
committer Bill Richardson <wfrichar@google.com> 1564786833 -0700

Merge remote-tracking branch 'goog/upstream-master' into bill-nos-merge

* goog/upstream-master:
  faceauth_tests: no longer check HAT for ResetLockout if user not locked out

Bug: 138660660
Test: bazel, release tests
Change-Id: I87495f9de1c8c9abd078f684f0b6cada467473f0