tree 25b56e4eaad74258f9a3b854196ca28b3ed8917e
parent a8f99519ab3fec77352f506c62c057e480ae90af
parent 86a36f2ae8b905bf16ff0ba28d2b7d4684f2f9d5
author David Drysdale <drysdale@google.com> 1714644105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1714644105 +0000

[automerger skipped] Revert^3 "Keystore: Validate curve names in XDH and ED25519" am: 86a36f2ae8 -s ours

am skip reason: Merged-In Ie63b8dfc8bb562b33e6e529d537bde64ae2c6d53 with SHA-1 934cd662e5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26744915

Change-Id: I973a0716c6f005f0ad35413beb13a7faccf61c63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>