tree 728ab8bf18f8a2a1b14b34f99fd291fab6646028
parent 6cf1e6ca36287ffff6899ed0e77b5d1a4f5627c9
parent ea991a4be5bc48a079647df2d35f8ca6ef0d896b
author Xin Li <delphij@google.com> 1591631802 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591631802 +0000

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