tree e3aa9c5f9bc1882f1fbf7bbc27f7544aee2087b6
parent 1864ba7b87bf20e35b1e1209b01c12b7b70fd62f
parent fa896ec4d9c21e81de4c01591f12f99e004cece2
author Xin Li <delphij@google.com> 1644862852 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644862852 +0000

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 6d3993bab0 -s ours am: fa896ec4d9 -s ours

am skip reason: Merged-In I3aa37a2a54caa0974cce0e3ec678845c19e33788 with SHA-1 e93c95aa15 is already in history

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

Change-Id: I6036ae8a4365c49e79d4f150fab1725106392f23