tree 38c216ce874356bc8b53c1ad45c1b85589f63623
parent dc2fd8b2da8fd06f668637af71f1dabc7acea6e4
parent db19730e87f8c8a978e6427071cfd465f6050aad
author Tony Wickham <twickham@google.com> 1468458655 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468458656 +0000

Merge "Use the shortcut's long label in the container, if it is available." into ub-launcher3-calgary