| commit | 8505785fa3119baea2e9d91dc5824f92714d4b3e | [log] [tgz] |
|---|---|---|
| author | Eran Messeri <eranm@google.com> | Mon Jan 29 13:35:10 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 29 13:35:10 2024 +0000 |
| tree | 0d3bc057c02b5e483e8a45a8f53ef0aab82d7b63 | |
| parent | 1710ea26e7cb01fbfe6dbee5e7eb092ab4b16a25 [diff] | |
| parent | d4d7a24e6b8b1402f4a254846d4e6e0aeca27b1f [diff] |
Merge "Revert^2 "Keystore: Validate curve names in XDH and ED25519"" into main am: 711efaa029 am: d4d7a24e6b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2929612 Change-Id: Ifbf62a76e80ba289edaa808772b924121d42d95c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>