tree ef6f44da5145bcbbcd404e98106f5798a3cee0bb
parent 4de32b2fb2c1b1e80593f2efc1c0108d3a8da027
parent a952c55faf681246627b246828771406c25f96a9
author Xin Li <delphij@google.com> 1614810514 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614810514 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf -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: I6a191eaa3a0abbe1d379f65d9475d0c54bd01c44