tree bab4b699adba853b8016f9ae324a823f20087b90
parent ea895791cca3184637f8ed0a80a46c703ae37702
parent a305214073667993207b0506ede81a23f6664ceb
author Jonathan Miranda <jonmiranda@google.com> 1625030545 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625030545 +0000

Merge "Allow two lines max for text view in system shortcuts." into sc-dev am: d4b713c7ae am: a305214073

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

Change-Id: I1b4f0d02726f990671fe15dbc4ac23da197e5be5