tree b1264f802260ccf7cba9d16a198b26121376c6e5
parent 9d81eb7961025a800a75e2e230f96bba920812ad
parent 3bec84ed54b3f731362b837ec8689c8852a8d360
author Bill Yi <byi@google.com> 1641579379 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641579379 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I2eaaa29dce40e6824144c1289212a0984316e6a7