tree 38c216ce874356bc8b53c1ad45c1b85589f63623
parent 49fdc0322796de76330070c27903cf2384910f16
parent 50f251bfc842c7403d4a69787f492cf9d2ab348b
author Tony Wickham <twickham@google.com> 1468459365 +0000
committer android-build-merger <android-build-merger@google.com> 1468459365 +0000

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

Change-Id: I788e97bcef428dd776fbf6a734274626a24c1c6a