| commit | 3803a10f9baaf7b4dfb49b7379f7c60f7cfbc939 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jun 16 09:57:31 2022 +0000 |
| committer | David Drysdale <drysdale@google.com> | Thu Jun 16 10:07:17 2022 +0000 |
| tree | f6d4f6bbafed8a228ac9a8f98e488dd4c28f2e59 | |
| parent | 94755b9007375559a928d7568bcdfb67b60b903f [diff] | |
| parent | bbecb4563fdd8a0e511a3be9c3312f4c7f033e2a [diff] |
[conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb4563f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2117528 Change-Id: I7d5a6e121c3dc1a73382713ef4af9d6ae08ae887 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>