Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit b45f944c authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Keystore: Support Ed25519 keys" am: fa8aac46 am:... 

[automerger skipped] Merge "Keystore: Support Ed25519 keys" am: fa8aac46 am: ad0c8bb2 -s ours am: 9f95237c -s ours

am skip reason: Merged-In I07b793cbd5029630768368ad4a863bbc1c828ced with SHA-1 143fa393 is already in history

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



Change-Id: I516f927cd3265a9d870e7a9a51e19d6b8eccda50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 06330a60 9f95237c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment