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

Merge "Avoid error message when destroying key w/o secdiscardable file" am:... 

Merge "Avoid error message when destroying key w/o secdiscardable file" am: dc262c27 am: 60c71b99 am: 2ef1832a

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



Change-Id: I9a0edebc0100cd56077e95ff5adb3f40d7b5129f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 13c2e12a 2ef1832a
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