tree 9f751242cbeffc6d5edce1be24d4a5001d6e23c1
parent 23c2836690d66f848d28fac2ca322674a7429a61
parent 2b65023217b931b77142baac40c6ddcced56ee2c
author Xin Li <delphij@google.com> 1591637102 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591637102 +0000

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ea991a4be5 -s ours am: 3856824fda -s ours am: 5663dd5004 -s ours am: 18e055265e -s ours am: 2b65023217 -s ours

am skip reason: Change-Id Ia11967c6f4cb86b5431cdb446a5b5c483ce09ba2 with SHA-1 6cf1e6ca36 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1323633

Change-Id: Ib6cac041533db62573aa037b3ff395d909784357