tree 39d4f9d208bc436924c71d9e567e833e64b8a6f0
parent 95f1cda431dce2f2db3ac7380de6340b9af8b005
parent c3b1cd4226be5e54de05d89289c2284f5b7f0ff0
author Xin Li <delphij@google.com> 1599859630 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859630 +0000

[automerger skipped] Merge "Merge Android R" am: 75abb09acd -s ours am: 284bd39fdc -s ours am: 2cb1e6bcda -s ours am: 8dec5b359e -s ours am: c3b1cd4226 -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: I03e1b4764b9921a540c8da4a6d042a1f12e19863