tree 45e294d605dfbe6155690428e45b37dc70b26fff
parent 6da3d88fbe779ad89e8d6f9f53cb927f12b20443
parent aeca9e072c90af702819453cf0868d868b134e52
author Shawn Willden <swillden@google.com> 1535530761 -0700
committer android-build-merger <android-build-merger@google.com> 1535530761 -0700

[automerger skipped] Merge "Require keymaster4 attestations to contain the right version." into pie-vts-dev am: 516718071b  -s ours
am: aeca9e072c  -s ours

Change-Id: I07651d65ccafb5b6df00cf8379d1d966570dc5ef