tree cdea26a17b78af82a1bccde4e16cfe197a3b3fb8
parent 94a05aa7f05ff6b19f3f093d0cc57c998217ffa6
parent 77015df54637f88b499a32df3538f0e20c15f5eb
author TreeHugger Robot <treehugger-gerrit@google.com> 1637178854 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637178854 +0000

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d4777b4401 -s ours am: 77015df546 -s ours

am skip reason: Merged-In Id217503f7f4423df25ae89eea305c2b2d3412a6a with SHA-1 3ba15f2799 is already in history

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

Change-Id: I02a17a450a0c27963e365e4a782b7bf121b848e6