tree f1be5ffd003175a9d2c531c47c80a52421736463
parent c52783bf329ea6cb8b5dba1aa73a17bc339c8947
parent 251238b60174506cc7f26915fb9ff6933e8ba9ef
author Andrew Scull <ascull@google.com> 1526567901 +0100
committer Andrew Scull <ascull@google.com> 1526567901 +0100

Merge remote-tracking branch 'goog/upstream-master' into merge-citadel-pre-1.0.0

* goog/upstream-master:
  keymaster: add HardwareAuth & Verification Token types
  keymaster: document bootloader parameters
  Add protocol for session bound physical input events
  Add auth token HMAC key sharing protocol
  Revert "Support message CRCs in the transport protocol."
  Support message CRCs in the transport protocol.
  Retrieve repo snapshot info from Nugget OS
  Improve Nugget OS version reporting
  NUGGET_PARAM_REBOOT always does a hard reboot
  Print more debug information about image header

Test: manual -- boot, set and change credential
Test: selected CTS and VTS tests from release-tests.sh
Bug: 79416307
Change-Id: Ieea084bb0b64d3c66ce2c2e43f3a93514e79a4d1