tree 735c0afd86fd219a9a5add9b4643851b12826b83
parent ecb18a657390663e8428c652b8d2747786540706
parent 053a3415fecf0aafda359b7b3db935ad770ebbb1
author Xin Li <delphij@google.com> 1607569498 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607569498 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 053a3415fe -s ours

am skip reason: Change-Id I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa with SHA-1 ecb18a6573 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7810ffdbc32a066d249324b95c02ad3c2e74f5b9