tree 760ab416b802a91fe5b37061d7fffa8a8ef8bb6f
parent 5d1f8cdc82819decac5d22f00a70bf9421407080
parent 49c03e1babca8694e577fe163a3dfa8a78d4ee46
author David Anderson <dvander@google.com> 1573793194 -0800
committer android-build-merger <android-build-merger@google.com> 1573793194 -0800

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

Change-Id: Ibb9a2c341982e8d39a5163e527472b5faf526d73