tree 3e9a72393e5873c870f6882a5116b36dd25730fc
parent a285af37b7853bacc61d87acbe836a58b8d20510
parent 1c5681eee862491935e8a154d9e1faf17c256e32
author Bill Yi <byi@google.com> 1641580448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641580448 +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 skip reason: subject contains skip directive

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

Change-Id: I39a10d5ae21117f15a4eab8c6f8ccb499196b02a