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

Fold read_and_install_user_ce_key() into fscrypt_unlock_user_key() am: fc1df0ea am: db7a017b 

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2777076



Change-Id: I0688fcde6f17fddfa49f3bbb0f1283eb73ccb906
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1a4ffde6 db7a017b
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