tree 6f81e464fc1e55009a4143d5f33da84213053ef6
parent 9997438c1cbf95d7b13befc8348a6af8c2ddc4f8
parent e7a060a91b32cae86a01f3fc9ff3e81b99a6d552
author Kelvin Zhang <zhangkelvin@google.com> 1610638825 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610638825 +0000

Merge changes from topic "imgdiff" am: e7a060a91b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05720babfa906eae2d54979e9de1e7fe4853a4c0