tree e6f52db6012421e6e1e91f97dfa437cf93f87a00
parent b0a25ef140964a27165b9c95732842e1685300fb
parent 18e055265eede5fd070c553ba8aacd8042bfc2bb
author Xin Li <delphij@google.com> 1591634519 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591634519 +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 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: I221958cc682bad45e8bbe3acf535a16983503130