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

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

Merge "SyntheticPasswordManager: rename derivePassword() to deriveSubkey()"... 

Merge "SyntheticPasswordManager: rename derivePassword() to deriveSubkey()" am: a2f9e65a am: 0573cdea am: b089c8aa am: 9e339979 am: 6a4f104b

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



Change-Id: I64eb1071dd19e1e8405e1cce4ec8dfcea1e642f5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fa2cbdf6 6a4f104b
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