tree d4f3ea771bc05b25781aa37708576bdc207ea4b7
parent 05bfabfc02c4cae4fd3d73d1a7631bb2f3bebec0
parent 75abb09acdd3d82eab95babe788df896339e44b6
author Xin Li <delphij@google.com> 1599784774 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784774 +0000

[automerger skipped] Merge "Merge Android R" am: 75abb09acd -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: If41856764970db256c8768944512d3f0ca47e1e2