tree 267cd060d479df82b024d59adff7348a899705a2
parent c82137493777d5a616f7ce8587469a6d853f0b92
parent 6e1dcc84bdac63645654052e38e489a36ade07d8
author Xin Li <delphij@google.com> 1646734904 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734904 +0000

[automerger skipped] Merge "Merge Android 12L" am: 6e1dcc84bd -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: Id1303261bcbc1acdd7653ceee4c6bf1061a24475