tree e9cfeb07ded83face9ada63fdb27f3520ab52203
parent 478c50aa93612b66e1e06486359015db53e97a63
parent e0f133bf04b36ed25150c7d22e9b1ce1c64f5bd0
author Tao Bao <tbao@google.com> 1570769381 -0700
committer android-build-merger <android-build-merger@google.com> 1570769381 -0700

Merge "AVB: decouple vbmeta.img from recovery.img for non-A/B devices" am: 549325427b am: 97c1c9aaa3 am: 04530d41c3
am: e0f133bf04

Change-Id: Ie92db847ea67f6da53eb8d9c46f5ff8cf030d7ef