tree b4731c4ba1a9d56a20b414ac3364f94ad90702cb
parent 9ce67b41378d9c3cc3cde619dbc63f2f6d2415f6
parent 83293654d7794523dc4ae2b78ae70f5df816cae0
author Bill Yi <byi@google.com> 1641581824 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641581824 +0000

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: db8910bf0c -s ours am: 3bec84ed54 -s ours am: 1c5681eee8 -s ours am: 83293654d7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I60d5eb915e8d9b5d801c257ee3804d6db9dcfb80