| commit | d407b64096bc33246b0ade9e52b0e1f2ac68b151 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jun 16 18:58:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 16 18:58:17 2022 +0000 |
| tree | 7895fdbb83bf8066c6cf2b9242915f1fb8d95d29 | |
| parent | 1af1b0886890f1b9b05167f58440f95e387a5063 [diff] | |
| parent | 3803a10f9baaf7b4dfb49b7379f7c60f7cfbc939 [diff] |
[automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb4563f am: 3803a10f9b -s ours am skip reason: skipped by user drysdale Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2129332 Change-Id: Iad07e7216651b427bd405f2a5510ba0b8c78b88e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>