tree e131eff88f15e51fc1485a27bd202bf4f1d4b28d
parent bbccce399721d3e1f4bdcd4838695eae2664dd4b
parent 8703ceb1a61aab1a147c31c786d8f5b7b77ada3d
author Jonathan Miranda <jonmiranda@google.com> 1625030500 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625030500 +0000

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

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

Change-Id: Iab1b813dd81bb7a37178c47466f356cacf74d50c