tree 97ca6b7542bcd9ae55d6a0869f179ec29ea30f93
parent 65707f3c0b7841bf0d1ba9eb6e5dfe60f2d8327f
parent 53bb55f7f5509184e2bad7532d1440b3d74d7516
author Treehugger Robot <treehugger-gerrit@google.com> 1596031294 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596031294 +0000

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

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

Change-Id: Ia755560411286e4a25db30e62f6092fb6dd41faf