[automerger skipped] Fold read_and_install_user_ce_key() into fscrypt_unlock_user_key() am: fc1df0eae0 am: db7a017bdd am: 988342f572 am: 66fdfbcfe3 am: f3b0d263f5 -s ours

Browse source

am skip reason: Merged-In If221e23991e8e04138ae7dbdafe8160b00893655 with SHA-1 92428b247f is already in history

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

Change-Id: Ide1373872599f804d86842add4027b28ef0d3486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Eric Biggers 2023-10-07 00:58:05 +00:00 committed by Automerger Merge Worker

parent 54bf85c665 f3b0d263f5

commit 0f3a71075c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available