Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit f64f801f authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

[automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/-... 

[automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb456 am: 3803a10f -s ours am: d407b640 -s ours

am skip reason: skipped by user drysdale

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



Change-Id: Ia1bdb8c2666655d619995691d2805c33596a24c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3f77aa2 d407b640
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment