tree 440384897fa5143e97d5b266b9b7172450ddf5ae
parent fb9d4fc54b4ca75e41f2b67830278942049b53b3
parent 3e72aaf11c00060241f2a59bbd4523600bf29a86
author Xin Li <delphij@google.com> 1591631804 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631804 +0000

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -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: Id0541da5f14ad32b40bfb85389fc3f3268135fb6