tree c314cb5264710c3af02d5209b57cf3843e3ac2fd
parent d124f96795eaa3acdf258982fc9c61b6bbdcb78d
parent 575c0be2756574da0d2eb933109cb8ecd7347697
author Xin Li <delphij@google.com> 1648976427 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648976427 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: b58d4fcf35 -s ours am: 822cf94aa0 -s ours am: 555944e12f -s ours am: 575c0be275 -s ours

am skip reason: Merged-In I348aac2cfcf84032e2526d03cc0adc989d3d0153 with SHA-1 db22144a52 is already in history

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

Change-Id: I99fd1af515c8191699c18bd8e86f1f95f38bb931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>