tree 0de3e9646ebebcdcebdd3811131f1fa88aca6343
parent 1740ceacfbfbaa8c92192b6444724524560232f4
parent 2545caab1e7e8ee52f8c490f556f68706a28f801
author TreeHugger Robot <treehugger-gerrit@google.com> 1637180388 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637180388 +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: 2545caab1e -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: I77ff6264a0aa610431167cdc9f9717573cad053b