tree 68b06784b519d261d8a9f99518737f0441734aed
parent 8883efde72e3ee2c17570bfad63633eea3fa611b
parent 4046722d02e343411eccc15d44b903b95603cb95
author Shawn Willden <swillden@google.com> 1533246149 -0700
committer android-build-merger <android-build-merger@google.com> 1533246149 -0700

Merge "Require keymaster4 attestations to contain the right version." into pi-dev
am: 4046722d02

Change-Id: I5a3005f265e3067e65b5bed671b14383906b4368