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

[automerger skipped] Merge Android 12L am: 7381b4d493 -s ours am: c821374937 -s ours am: f34c62428b -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: Ieb6d8d4e2f1cccd38898a8fbb8f6e9b2ec3601b6