tree 98fbbe6b3f2dd016eaa9135b287aa94bb8af1a2e
parent d4b94d95ab565adfbdb7913cb3a6770465a69900
parent 4cd238b900ae594d335d08d465661bf3dae62f41
author Eric Biggers <ebiggers@google.com> 1594934172 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594934172 +0000

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

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

Change-Id: I862a51b219b0151c24d009921fa6cd509afa18b0