tree aed0c6c59cf368fb5679e5fef76fe5049a43602b
parent 1efd64a53e405a6ef0ecd5b5ff2c9592d90e8f92
parent 711efaa0297f845c60a1de0acce680493f90bf02
author Eran Messeri <eranm@google.com> 1706532723 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706532723 +0000

Merge "Revert^2 "Keystore: Validate curve names in XDH and ED25519"" into main am: 711efaa029

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

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