tree fe7b5f618fec07b82c643eed138e46a5adde767a
parent 83a9c614c1353648a4d68081ededbc1165d9bce3
parent 2cb1e6bcdac4dfdad3e8f75bb27ffe9d9702354e
author Xin Li <delphij@google.com> 1599795190 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795190 +0000

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