tree b20d47acc3b6042dadae64343c8f23b3dd0b13fe
parent 5e7b499dc7e157d86bf30decbe7ca0321160f9f8
parent eed2c3fc67fbbfeb944934af4602ff632dfd8535
author Xin Li <delphij@google.com> 1624257764 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624257764 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: e01e5dda78 -s ours am: eed2c3fc67 -s ours

am skip reason: Merged-In I5e4b540f169d365c60cf4461e19cda24009f325d with SHA-1 eac11b669d is already in history

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

Change-Id: Ied577142b59fa89f653bb41998193ff734395292