tree ec4911db56484aebd3a8c66e4f19859aefbab79d
parent 330b6df17400cf8481a995e3113544e3c25210a6
parent c94399911cd080237ba8980ffe9c81524c9c72d6
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246207 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629246207 +0000

Merge "[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295 -s ours am: 47fb2759e4 -s ours am: dea81b4162 -s ours" into sc-v2-dev-plus-aosp am: c94399911c -s ours

am skip reason: Merged-In I1503e40bd55ad8595965e407abeb2df9e1b183e4 with SHA-1 610c2e5814 is already in history

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

Change-Id: I7369cdb7472c2db119aa2709b6d82c5c94166bb7