tree 546989fc3700de9d4f6b8c9a81456741eb9c0d40
parent 3c2ef0097ff1c669785358d0208d6b180a68b092
parent 818495e2958f7ea946a35341ab29c19b11ed800d
author Xin Li <delphij@google.com> 1629225332 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629225332 +0000

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