tree cb78737e2ee3edb8ea477c12752af8d373ee4730
parent 837e8d58fe0ffc7aa2f8c3428c5bb02f508bd4ad
parent 8dec5b359ef90cbd9855d7f20fe0052d57d48999
author Xin Li <delphij@google.com> 1599796720 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796720 +0000

[automerger skipped] Merge "Merge Android R" am: 75abb09acd -s ours am: 284bd39fdc -s ours am: 2cb1e6bcda -s ours am: 8dec5b359e -s ours

am skip reason: Change-Id I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc with SHA-1 05bfabfc02 is in history

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

Change-Id: Ie2f4a6e8b1342c82113ea60c09df673ef139a7b3