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

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