tree 7cce13d734d925884fb696091e7a6c91e6ad35fb
parent b02c486ece3f542152256acd874344d92b96322a
parent 724444c2938bf2dd6e3cb4625344303cbd248a30
author Xin Li <delphij@google.com> 1622730733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622730733 +0000

[automerger skipped] Merge ab/7061308 into stage. am: fea7439a2e -s ours am: 8d12226c10 -s ours am: e8354919b0 -s ours am: 724444c293 -s ours

am skip reason: Merged-In I6551a7e630f7fd33d2083e939b503d3f52d8a4cc with SHA-1 049745c912 is already in history

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

Change-Id: Ic9262803c8016645f69e78f58c3d62555c8c771c