tree 2e0ed9f9b378f6ed04358f78fdab205a39268850
parent 0d375c657af3451f8b413e3d7d75f82a989f03e9
parent b2c7beb2b1c330432ff4ce6d33f89565d052f47f
author Kelvin Zhang <zhangkelvin@google.com> 1610640155 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610640155 +0000

Merge changes from topic "imgdiff" am: e7a060a91b am: b2c7beb2b1

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aa6658475c11275e806d50b1e3f5a4e319b57dd