tree 1038e88eea5ca9503f4ae43cd8c24c60a85a92d0
parent 9ef9c4ada01e568ed0904719d79fd303e9b88110
parent 179b7696827c8007e552fe7f8b11800c3b4cc904
author Treehugger Robot <treehugger-gerrit@google.com> 1628194796 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628194796 +0000

[automerger skipped] Merge "[DO NOT MERGE] API level 30 upgrade: AOSP/Launcher3" am: ae7a7396b7 am: 179b769682 -s ours

am skip reason: Merged-In Ie476f8cbe56bf51218b15b8361a22fec2dc845e6 with SHA-1 1c01685186 is already in history

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

Change-Id: Icffa0849618ac2da9324754d7f5770614c342c71