tree 21cf8b5891ac296dd2c10a69717b19e0104b3ce5
parent e928a1a4ad8a4c698086c8e109881b7fcfe13f17
parent 3ae951c611b64a86f0a56718de604948cdd6bc98
author Matthew Maurer <mmaurer@google.com> 1557260708 -0700
committer android-build-merger <android-build-merger@google.com> 1557260708 -0700

Merge "Update Attestation format to KM4" am: 9d6d7b83ab
am: 3ae951c611

Change-Id: I926dc2268772542f25bef13e7b22558d0298f4c0