tree 2e864304342abe688a8a056ad4521908a46d3623
parent 6e66597cf6549d85614461696d0f1c393b681de7
parent 7208d546efb48f3220814ccdb6de081eaf54eaaf
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1577482013 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1577482013 +0000

Merge "libfiemap: Add helpers to remove images from recovery." am: 8edafa2393 am: 7208d546ef

Change-Id: I47eb95360eea05f79a099eb5c54b31f2c5e2e8cf