tree 546989fc3700de9d4f6b8c9a81456741eb9c0d40
parent cf29fa5d1092994d595e9690c12a1afcd5f9a09f
parent 47fb2759e4762c993c970ef77f46f76f40aeb55d
author Xin Li <delphij@google.com> 1629229563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229563 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295 -s ours am: 47fb2759e4 -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: I88bc38c1079443da24fb5b24dee67dd9ae928dda