tree 5c7f9c7b9d9bd35c5af0bc01bed516f60023b08b
parent 1055819fa84aed004406e23417237c33a08c419c
parent 5fa37b77d1a85f39e1542f4a0da75e03c88eac08
author David Anderson <dvander@google.com> 1554242954 -0700
committer android-build-merger <android-build-merger@google.com> 1554242954 -0700

Merge "Append -verity when looking for verity device-mapper names." am: bc2eab4315 am: 9a53189ae5
am: 5fa37b77d1

Change-Id: I44383f3609730fc12aeac24061a7940010a60338