tree 3c5279361fcb02ca50fc4bb431619f0833cad64b
parent 8dfb2193aaac22f8f0ff48bce1e23e6823b6bea9
parent 4c0124783177dafc4206dd229b4e759fbaba5e16
author Allen Webb <allenwebb@google.com> 1522358564 -0700
committer Will Drewry <drewry@google.com> 1522373563 +0000

Merge remote-tracking branch 'goog/upstream-master' into nos-merge-upstream

* goog/upstream-master:
  avb.proto: add resetchallenge and getproduction
  flash: update of cert & provisioning data offsets
  Suppress clang 7.0 warnings.
  Add retry logic to get_status() function
  Define static lib for 'recovery' system module
  flash_layout: Add manufacturing related config
  updater: Add option to wiggle Citadel's reset line
  updater: Add command to read Low Power Stats
  Reserve a fake AVB_TEST app ID just for testing
  keymaster: add factory-setup methods

Bug: 74946926
Change-Id: Ic4bf32b5994a0f159ce4d0efaab6e1427ae1142e