tree cdea26a17b78af82a1bccde4e16cfe197a3b3fb8
parent 43f2167ad6d38ef49e726621bbc509eea7fa236c
parent d4777b440172e8c57cdf2ae3830ba8eb0e65384f
author TreeHugger Robot <treehugger-gerrit@google.com> 1637177816 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637177816 +0000

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: d4777b4401 -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: Id5eb07e002909059562d92ab45a1375a9ad90c41