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

[automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -s ours am: 8f26d0a018 -s ours am: ab6fc1a11b -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: Ife76d4171b756e3a00ab988fc2a6b5f08b267de8