commit b9f0251f59a52b0f5197d90ae2dbcafadacd4757
author nagendra modadugu <ngm@google.com> Tue Jun 26 19:49:49 2018 -0700
committer nagendra modadugu <ngm@google.com> Tue Jun 26 20:04:38 2018 -0700
tree 149b82248953ab941d5e69edd2d69fdaaa5d99d0
parent edf1f32082849c3b0a21489862014a31a2c4ee69
parent 44dbc43d1f62f3a78daf0a014645d141f462d45f

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

* goog/upstream-master:
  avb_tests: split out reset keys; enable key testing
  avb_tests: allow 0 or 1 for the selector
  cavp: fix build breakage
  keymaster: generate key-blobs in tests
  Revert "avb_tests: allow 0 or 1 for the selector"
  Revert "avb_tests: split out reset keys; enable key testing"
  avb_tests: split out reset keys; enable key testing
  avb_tests: allow 0 or 1 for the selector
  Test for slave implementation of v1 transport protocol
  keymaster: update blob format

Bug: 110858895
Change-Id: If1fab9752468a6cee48867c45e706243dbc74a37