Skip to content
Commit 2ef1832a 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

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



Change-Id: I3c1ccbf5a48de8281db1244471f40831e32decbe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44d3181b 60c71b99
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