tree e19b3f9cb982f81a7464ccedb8bb8632ea6c1fcf
parent 5542d9003e80620d8fae4af5523f9c9a2d4c2c74
parent 64a6d542c70d86ebc617f96d8a897eb4e98669cf
author Janis Danisevskis <jdanis@google.com> 1527836758 -0700
committer Janis Danisevskis <jdanis@google.com> 1527836758 -0700

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

Doing a merge, because we reverted the previous merge and I
can figure out how to make git/gerrit happy about it.

Changes:

  - Protocol for preshared secret provisioning.
  - Added boot_hash and GetBootInfo().
  - Add NUGGET_PARAM_AP_UART_PASSTHRU to control AP UART
  - keymaster: use enum for boot color
  - keymaster.proto: Add boot_hash to SetBootStateRequest.
  - keymaster.proto: Added SetSystemVersionInfo RPC.
  - Transport: increase datagram retried to 300ms
  - kemaster_defs.proto: Added missing tags.

Bug: b/63388215
Test: It Works For Me(tm)
Change-Id: I0be6bb1677b6afb42172678398bb17b11ea38dd3