tree 368eddfb97da956667b873e2da8d43e397a7d520
parent 116e76d2023d3888758ff820bc66c4ea5a887bb4
parent c5925cca252b907a39871f75bd08c98cbc4cf442
author David Anderson <dvander@google.com> 1552516462 -0700
committer android-build-merger <android-build-merger@google.com> 1552516462 -0700

Merge "Rename vbmeta_mainline to vbmeta_system." am: 6c009aad3f
am: c5925cca25

Change-Id: I56a20c92e3fedf8154fb8ebfff0c9ae7ba3bea7a