tree e131eff88f15e51fc1485a27bd202bf4f1d4b28d
parent 35b1fc6af6d3af94fc17cf70db53e36301d975d8
parent 868fa96dadfb9e3ecdf407bd53c67a2da54d96ce
author Jonathan Miranda <jonmiranda@google.com> 1625031404 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625031404 +0000

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

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

Change-Id: I8910ac54915ae8c932ab037aa16e66d3b7e6431c