tree d3cc028cfc6733aa19441b0dfa9f2956c42f8921
parent 9f5dcf1f08566c0d0f3ba8dc648bb162000541ae
parent 121607b3adbfe98c5de793ec9e993f9abe3935bc
author Xin Li <delphij@google.com> 1660695064 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660695064 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 266e0ce537 -s ours am: 7c1beee4b9 -s ours am: 121607b3ad -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: I4f55e5db4b38e064bf42a5e6d38a0554407aaccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>