tree cf1d2243e2317743859f02ee5b7601d6cfab526b
parent d64669a969f171e68649a7d5ad2b60468fc24297
parent c33f79118d6980b9b1bae5183067f0868cc6102d
author nagendra modadugu <ngm@google.com> 1532390034 -0700
committer nagendra modadugu <ngm@google.com> 1532390483 -0700

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

* goog/upstream-master:
  keymaster: refactor batch cert constants
  [keymaster] Select attestation certificate chain based on hint
  [keymaster] Switch to prod/dvt attestation keys

Bug: 111761046
Change-Id: I231a4fb8e13de1230e42c51aabfe03eb6ada7ed4