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

Skip to content
Commit c1df5d39 authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

Merge "Simplify some code in KeyStore2ParameterUtils#addUserAuthArgs" into... 

Merge "Simplify some code in KeyStore2ParameterUtils#addUserAuthArgs" into main am: d9491b04 am: 7a6fe1b3 am: 8439eec7

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



Change-Id: I17956fa83761e89e3e24edf79985fdbdffabdfe1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27c17252 8439eec7
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