tree 6bf3bbf16bd34a17df8dbf2d1fe50565e91ae5fc
parent 8879f6cf88cb454c665edb4593bc20e08f182525
parent c00a7a6b69f222c020a6ba95fb7360064a34ec24
author Andrew Scull <ascull@google.com> 1528376529 +0100
committer Andrew Scull <ascull@google.com> 1528376529 +0100

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

* goog/upstream-master:
  Revert "Transport protocol v1"
  keymaster: protos for attestation
  Transport protocol v1
  Add NOTICE files to get copyright info published
  NUGGET_PARAM_ENABLE_UPDATE tells us whether it worked or not
  keymaster: send back algorithm & key_bits to HAL

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