tree 55508597d3bb8762c6ae39d2ef682c891357a851
parent 941bf55f9d60f7946d4736858578135c50815447
parent 90a22f36f9e2317ea46e0ccfc465e5b206cfd27b
author Xin Li <delphij@google.com> 1591632479 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591632479 +0000

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 3e72aaf11c -s ours am: 90a22f36f9 -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: I788225ab50338d17b34bf615b117ef9c2429ad64