tree d4b40f0dcd91d5c931ed7b1ec9c693128211083a
parent fcd45b229c42fd3bb5d162239b1814cb13817ec0
parent 16da08890d8008f914dc049daf2dadc52a3f55e0
author Xin Li <delphij@google.com> 1614816720 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614816720 +0000

[automerger skipped] Merge "Merge RQ2A.210305.007" am: a952c55faf -s ours am: fc8f576c00 -s ours am: 16da08890d -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: I6706d671a1c962402faa84674b5f6499d2b22b62