tree 64d4ef6b1741ae763ac744b5d9e11d1959df3cfc
parent 52e29ebb9b927237f6f23325642efb2953ccba73
parent 7d4089c580650822811d63ab0af7f870ac211720
author Xin Li <delphij@google.com> 1656551067 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656551067 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 82c91a626b -s ours am: 5bb33f310c -s ours am: fb5ccbc49a -s ours am: 7d4089c580 -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: I2eff36f93d15edf316ae2f4798190465b939c61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>