tree ff4d3a6db5d68081cee847c9854678757532548a
parent 391de784d3c6b77502ee50be598cc5f88ca2965d
parent 3ba15f27992a847363a6f67daa2589c7fcd5346c
author Xin Li <delphij@google.com> 1633681757 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681757 +0000

[automerger skipped] Merge "Merge Android 12" am: 436a520a57 -s ours am: 60c3c08aa4 -s ours am: aaccc6518d -s ours am: 3ba15f2799 -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: If1040141b42d035932562c715adab7cd39306c26