tree ff4d3a6db5d68081cee847c9854678757532548a
parent fc87149c4d00af66ee98b59af9d1bd73b4fe0561
parent aaccc6518d4e16624ec004a7dc3a847b78c8b5ac
author Xin Li <delphij@google.com> 1633679779 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679779 +0000

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