tree 2c4fec77c28311690cb00bae76be907721110f0c
parent 7b8f1eaba147ac42a347f3787d0e90b24be015db
author Tony Wickham <twickham@google.com> 1468457186 -0700
committer Tony Wickham <twickham@google.com> 1468457186 -0700

Use the shortcut's long label in the container, if it is available.

Bug: 28980830
Change-Id: Iefea0a7ee4be5bf45af14ce47abdd597f4137f92