tree 3412f5fbe704006e18b2c8cce1716b24bc868514
parent 1e0da76374bc4cf5d9974b83b4e6487347663c41
parent 8768f583c5e29b27c9d7302292ce8c063273e576
author Xin Li <delphij@google.com> 1665510936 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1665510936 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 8768f583c5 -s ours

am skip reason: Merged-In Ic68898f1a8e9ab176556ee2b61efec4d8d5d36e2 with SHA-1 d43ec47f3b is already in history

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

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