tree acfeaa54979179588b292788f11f4a7d734ed8b1
parent 4da67d0e9ba84cb3286206a7cff5878cd46509f4
parent 18338a4f70c50980b3042a4bdad9ae213badb3f7
author David Drysdale <drysdale@google.com> 1655693183 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655693183 +0000

[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: 18338a4f70 -s ours

am skip reason: skipped by user drysdale

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2129332

Change-Id: Ia050bce8722c8441d4fdb3e5f0da53148382cec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>