tree 728951f479300ce97f72dfc2ddd07a8ef96c4b61
parent 5709fd73e3241003424c7d656eb8375dc258050d
parent d5c4436723ceabcdb825a20ae35ea509719bbea1
author Xin Li <delphij@google.com> 1591637105 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591637105 +0000

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -s ours am: 774e6307df -s ours am: 93b2650a81 -s ours am: d5c4436723 -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: I22d9227d511e45e6e51997e1ba8e0cb186b06c6b