commit | e760661068709dfb65cf20f8e0860ce658f7d21c | [log] [tgz] |
---|---|---|
author | Nick Bray <ncbray@google.com> | Wed Jun 16 03:09:30 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 16 03:09:30 2021 +0000 |
tree | 506a5ea487f3973681b30b23027c14fd60abf586 | |
parent | 1ce19c578a75a986a67fe866da4f863e4122aae1 [diff] | |
parent | 12c408da4b991c74a976d800c8af69c1268831d3 [diff] |
[automerger skipped] Merge "Add message for setting attestation IDs." am: 6f5005fdc9 am: c70f358614 -s ours am: 8d4302acac -s ours am: 12c408da4b -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: I4f44ff70c3167304a82ad60edc4e3d2297de8e6e