tree 8014432a439725a89eb99bef62b9372322383a5a
parent 7f62020cde6bba6b13a1d29ec5c885fc8a6f2292
parent 23870fcad0eca7c839f87ba5d8b2a50c4542e6c4
author Xin Li <delphij@google.com> 1614818181 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614818181 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf -s ours am: fc8f576c00 -s ours am: 16da08890d -s ours am: 23870fcad0 -s ours

am skip reason: Change-Id I90dcd247e1541f3bf7f16d95c7cef6256ae462aa with SHA-1 4de32b2fb2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e5eb51d777b8e7d83ef96f1df324528974543a7