tree a6080d224e41384852721a0a8885f4ff545d69d3
parent 7c46bbe1df20d473bb61eb7de6ffafb4ad927bcb
parent 4c314a0a9b230e6e24600051d20c5010c84a52a7
author Xin Li <delphij@google.com> 1623658789 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623658789 +0000

[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 2bbaa4f010 am: 23a9661d5c am: 350d402f94 -s ours am: 4c314a0a9b -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie5b07feb85ed3d38ddc1ceeb5d5fd69a9c52ed99