tree 55508597d3bb8762c6ae39d2ef682c891357a851
parent bfa93a9472e5054fdd2dc578450563fed5dce424
parent 774e6307df068531ffed7db16d722c4b08e6de34
author Xin Li <delphij@google.com> 1591633758 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591633758 +0000

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours am: 774e6307df -s ours

am skip reason: Change-Id Ia91690b4826ce358a08766ebe6e756cb1fec0ba1 with SHA-1 fb9d4fc54b is in history

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

Change-Id: Iaad713ffb22bea494bee48895ee0984e05f4fc4d