tree 97ca6b7542bcd9ae55d6a0869f179ec29ea30f93
parent 0a664e383b78b56673f7d64d5a79f2105397847a
parent 7a26749d32256e900501049ee320e7aa6f73e429
author Treehugger Robot <treehugger-gerrit@google.com> 1596032462 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596032462 +0000

Merge "Add -d parameter to mixed_build script to totally skip vbmeta.img replacement" am: 40575a5424 am: 53bb55f7f5 am: 7a26749d32

Original change: https://android-review.googlesource.com/c/platform/development/+/1376216

Change-Id: I45c5e0c3c3ddc838ea6ce90a9ee0e238cfa69fe5