tree d3cc028cfc6733aa19441b0dfa9f2956c42f8921
parent 252fb4cdcbf0ff6970b55a6c7f244026b7c9ce8e
parent f0735f0cb3fe693c511ef30a58c7b6844b09132c
author Xin Li <delphij@google.com> 1660695062 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660695062 +0000

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 797d7d2b95 -s ours am: 3e40380c07 -s ours am: f0735f0cb3 -s ours

am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2 is already in history

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

Change-Id: I95bbbdad590335bdf773beaaba9efcda3d20dc72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>