tree 4bd62b87eadddf1cf52907826ee918ea6df2588e
parent e69488009e7923415cd9d6a6e29531bb46529b89
parent 284bd39fdc41287bffae59412140e38925769dd2
author Xin Li <delphij@google.com> 1599789739 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789739 +0000

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