| commit | 18338a4f70c50980b3042a4bdad9ae213badb3f7 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Mon Jun 20 02:21:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 20 02:21:35 2022 +0000 |
| tree | ae1f185c7aaf3c43541972322ae1b21be2cc652b | |
| parent | b0028a1330ea569f910ddd4af62943378b812674 [diff] | |
| parent | 18c89dfd4a871ea731b53b44e70500424a0ac8ad [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: 18c89dfd4a -s ours am skip reason: skipped by user drysdale Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2129332 Change-Id: I105961fb1b10de298c3e54cc081ef92157cc90c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>