tree 506a5ea487f3973681b30b23027c14fd60abf586
parent 1d1ddbb6b19db74310252f77869541797e1c3abc
parent c70f3586141421dbba4ae7c7f826affa26127432
author Nick Bray <ncbray@google.com> 1623809982 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623809982 +0000

[automerger skipped] Merge "Add message for setting attestation IDs." am: 6f5005fdc9 am: c70f358614 -s ours

am skip reason: Merged-In If587a6bd28b8cbb0b11ac70a98c9841121836479 with SHA-1 42449a5082 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1736283

Change-Id: I5787dc1bc05fbe345a14d5ab98934f954bd86193