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

am: 2b0ce83a04  -s ours

Change-Id: I2556f70510c08783e0635377f1702db617c5703d
This commit is contained in:
Shawn Willden
2018-08-29 01:19:14 -07:00
committed by android-build-merger

Diff Content Not Available