tree 77a90e1bea8dd0fba1a0ed1147941210c3406599
parent 05d2ab3f685497d86c2342859383402d1cdbb8a5
parent 49665ae5f9880fd27c7806e01e737e30fc249c56
author Xin Li <delphij@google.com> 1607572006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572006 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 053a3415fe -s ours am: 49665ae5f9 -s ours

am skip reason: Change-Id I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa with SHA-1 ecb18a6573 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib590035a7b3f124b2a767279623d51bc8c0dbd18