tree 98fbbe6b3f2dd016eaa9135b287aa94bb8af1a2e
parent 9afa4c65d86a50dfc7fd5aee83ac6053f0ca3b39
parent 15c0d3e5d0e0bb04a3c14ee0cd83181200c13458
author Eric Biggers <ebiggers@google.com> 1594933233 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594933233 +0000

Merge "vold: remove checkEncryption" am: 2d9777bfbf am: 15c0d3e5d0

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

Change-Id: I23b9a01632b61a92896ae83e2152fa047dd85c48