tree 98050401381afa3d32622cd25157ed31dab72790
parent c89be6cf638786182741473c3b1e621ee0ef6582
parent cb5a400e0b27ca3d1add01ab18eec187103b62ab
author Garret Kelly <gdk@google.com> 1557330487 -0400
committer Garret Kelly <gdk@google.com> 1557346677 -0400

Merge remote-tracking branch 'goog/upstream-master' into doodle_wip8

* goog/upstream-master:
  src/faceauth_tests.cc: return profile id stored
  faceauth_tests: add firmware incompatibility tests
  faceauth_tests: add version mismatch test
  release-tests.sh: enable keystore CTS tests
  faceauth_tests: interface change

Bug: 128111918
Bug: 128981297
Bug: 129159434
Bug: 129268150
Bug: 130304269
Bug: 132201532
Test: manual
Change-Id: Id64c0b779a0b32b9c43b088d4e2ba36db94b398f