| commit | 3ea6a2830b9f1c037d3be690ee9b3e3f25735fdc | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Mon Jul 01 10:28:13 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 01 10:28:13 2024 +0000 |
| tree | a8c6b2dfdd54102de69840df02d241bde78ff787 | |
| parent | 676ee5519b38b038c5d062b50f8919da34148369 [diff] | |
| parent | acdff1a3a34b89c286aa1bcfee0d1971b931c355 [diff] |
Merge "Cope with mixed KeyMint/Keymaster-4.x devices" into main am: acdff1a3a3 Original change: https://android-review.googlesource.com/c/platform/system/security/+/3140638 Change-Id: I49a09427d203ab7bc6b716dd3bec0eb967e97fc5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>