| commit | 18c89dfd4a871ea731b53b44e70500424a0ac8ad | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Fri Jun 17 00:24:11 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 17 00:24:11 2022 +0000 |
| tree | 986308cc836a86470e0aad29ca396ed393c1e3e2 | |
| parent | 6259374edae5f4828e7b33d00ce9bed5b8f4b1c7 [diff] | |
| parent | f64f801f60c9d3c32e935a3dc113f1e157916cb9 [diff] |
[automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb4563f am: 3803a10f9b -s ours am: d407b64096 -s ours am: f64f801f60 -s ours am skip reason: skipped by user drysdale Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2129332 Change-Id: If7605e387fe12d921f716da68b99cb65cbc10f07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>