tree 316022fbf55b4d76d21bdcc382efcb879e541404
parent f6f1a8a7d61ebe6814a8a2fafdf9526569e5242b
parent f2f5f9def7dd7dcdb6b25f07541f525abb63a417
author Andrew Scull <ascull@google.com> 1528376556 +0100
committer Andrew Scull <ascull@google.com> 1528376556 +0100

Merge remote-tracking branch 'goog/upstream-master' into citadel-ba9f1d086

* goog/upstream-master:
  Revert "Tests of Citadel's transport protocol implementation."
  Tests of Citadel's transport protocol implementation.
  Copy the NOTICE file from Android
  keymaster: add mock hmac to import-w-k blob
  Remove secret keyword
  Fix the android build errors related to FLAGS_print_uart.
  Move some print statements to verbosity=INFO.
  Added util_verbosity and util_print_uart flags.
  Add placeholder android pay test to release tests
  Add tests for AP UART PASSTHRU
  ImportKey tests can't be run on Android
  Test bootloader can wipe data then set boot lock.
  Updated documentation to trigger a build.
  Weaver: regression test for data wipe behaviour
  keymaster: refactor bootloader utility code
  Add some tests to validate a release candidate

Bug: 109864210
Test: Update, boot, set and unlock with PIN
Change-Id: I1b5aa1859df4b0b7f1957fced2764ecc6c82630a