tree d60046f574757cf06673d4d4093305d497446f7c
parent 3d369a31885ea24ebbe77ce0c0175a9ab87048db
parent 4f8d5e5a4d4a4587c827bd2506d3ee26013627cb
author Xin Li <delphij@google.com> 1633683568 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683568 +0000

[automerger skipped] Merge "Merge Android 12" am: 436a520a57 -s ours am: 60c3c08aa4 -s ours am: aaccc6518d -s ours am: 3ba15f2799 -s ours am: 4f8d5e5a4d -s ours

am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a is already in history

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

Change-Id: I262f848259d27d89c92e988e3970f964f9e60e8a