tree 73f39f6821b8f68b3792af93e55b77af02f62641
parent f0f95decb32d8e04db5d7af5031d797002c9fbf2
parent bc4b39efffd37ab0b4238f3234909eb369bc478b
author David Anderson <dvander@google.com> 1573792953 -0800
committer android-build-merger <android-build-merger@google.com> 1573792953 -0800

Merge "Force merges to complete before wiping data or metadata." am: 8444dec7ac
am: bc4b39efff

Change-Id: Iac20a6d65d48b2014aea4d118d730e933950e2e1