tree ff4d3a6db5d68081cee847c9854678757532548a
parent fa27392f8a45e5eeb7e0a94e8c9b199ebae5ce78
parent 436a520a57b559c3da6af222328218cae9b703cf
author Xin Li <delphij@google.com> 1633655978 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633655978 +0000

[automerger skipped] Merge "Merge Android 12" am: 436a520a57 -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: I1d324fd336fa96c02539ae08351620b0736070ca