| commit | 0cb2b57c77bcbe6466c8021dff841b47ad1a02a0 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Mon Jun 20 03:39:14 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 20 03:39:14 2022 +0000 |
| tree | f7873cf6448ec6c71672aaae705a57b353a2154b | |
| parent | 3f07efc75db7b01ff71366cf069303d6cd2bc426 [diff] | |
| parent | d9b51dcede18f5a11a19b788a65ea6eeecb23a20 [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: 18338a4f70 -s ours am: d9b51dcede -s ours am skip reason: skipped by user drysdale Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2129332 Change-Id: I84b2711a7ab7251ff8bc785922b4f6a1f537a950 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>