tree 83e20fc1719afc28af3e831faefabd379613c3b0
parent a51ed72629cbe8c8292dc84151c920e5eda73d59
parent 45f983bcf2db8550dac4f0a6b48f4d7bb0f96de1
author Xin Li <delphij@google.com> 1646825787 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646825787 +0000

[automerger skipped] Merge Android 12L am: 7381b4d493 -s ours am: c821374937 -s ours am: f34c62428b -s ours am: 45f983bcf2 -s ours

am skip reason: Merged-In I68c31f5fafc31f74d2c10a99fde3d0a4ff961002 with SHA-1 60b8b4dd61 is already in history

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

Change-Id: I891f91c2aea1349fd9f25eb16d0ddd06e28f67f1