| commit | f64f801f60c9d3c32e935a3dc113f1e157916cb9 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jun 16 20:30:17 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 16 20:30:17 2022 +0000 |
| tree | 7895fdbb83bf8066c6cf2b9242915f1fb8d95d29 | |
| parent | f3f77aa2a9c84eaf11d29295e0c897d6af5991b7 [diff] | |
| parent | d407b64096bc33246b0ade9e52b0e1f2ac68b151 [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 skip reason: skipped by user drysdale Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2129332 Change-Id: Ia1bdb8c2666655d619995691d2805c33596a24c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>