tree 278d16a4bc1e554bb64369236f123d0c1c0917b2
parent 2cf161bcc758f8c64ae596b323dfd6332b2413c0
parent 55f8b894a351a868a9a5167bd582faa0704fa959
author David Anderson <dvander@google.com> 1557519384 -0700
committer android-build-merger <android-build-merger@google.com> 1557519384 -0700

Merge "fs_mgr: Don't try to suffix "vroot" with "-verity"."
am: 55f8b894a3

Change-Id: I29fac2f7785850749f67762b03c9488750f64238