tree b105313503530ed014bea9c18db038cea0c73a6f
parent b01dfa6db0aeeb816ce7c682b8205cad2dee0487
parent 58fe773798a7018b0ff2af939c9025c6ac7bb564
author Xin Li <delphij@google.com> 1673645722 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673645722 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f4d5465366 -s ours am: 58fe773798 -s ours

am skip reason: Merged-In I9ca1643c37cf1ccdfecff4bfd0f405718be75669 with SHA-1 1788ccc385 is already in history

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

Change-Id: I095e627a66d79408a3ce2d8f145ee878a6033f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>