tree d4c0df9d6d58ad4235728dbab930142576d97d97
parent 7d4089c580650822811d63ab0af7f870ac211720
parent cb2b8650deaa0e859ec9c4b08dc168f32420ddf9
author Xin Li <delphij@google.com> 1656547583 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547583 +0000

[automerger skipped] Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master am: 3d82b087ff -s ours am: 2f874d64f6 -s ours am: cb2b8650de -s ours

am skip reason: Merged-In I28ab4357c9ac3e088776f92a0e1f7d390b4b0bdc with SHA-1 29ace0ba4c is already in history

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

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