tree 50808db5ea1eb4dc24a3b988f382af6de6c8d539
parent 15c0d3e5d0e0bb04a3c14ee0cd83181200c13458
parent 47425d05a95db0e860c86a32a1b59b4db613b768
author Eric Biggers <ebiggers@google.com> 1594949924 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594949924 +0000

Merge "vold: drop local fscrypt UAPI definitions" am: 47425d05a9

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

Change-Id: If47e4ced3b37e44772d802fb8ebe2d9ad51c03e2