[automerger skipped] Merge "Keystore: Wire up Ed25519 signing" am: c4c1676671 am: f130d0bbdf -s ours am: c79b934ca8 -s ours
am skip reason: Merged-In Icce4f7f2f8fa10081a9c6beff4813c2d91756469 with SHA-1 46faab535f is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2096493
Change-Id: Ifbf8256c0dd6dd504a108a687a4cb6be5235cfc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: