tree 73f39f6821b8f68b3792af93e55b77af02f62641
parent 85808f6a690f74d20bb47bcecf24d190d9ea0de5
parent 8444dec7ac22f6876651110b2ec831032ed875fd
author David Anderson <dvander@google.com> 1573792706 -0800
committer android-build-merger <android-build-merger@google.com> 1573792706 -0800

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

Change-Id: If50fd0536584c8e1271ea6212c9fe76e9b208b22