tree 7266b11c76bb027fe71f284677838843bac74514
parent cd352d671284ca69fbe551a65a2c1b376f7d7614
parent 37aba27bbcc89417588a638d61099288553387df
author Tony Wickham <twickham@google.com> 1470420931 +0000
committer android-build-merger <android-build-merger@google.com> 1470420931 +0000

Merge "Use shortcut disabled message if available." into ub-launcher3-calgary
am: 37aba27bbc

Change-Id: If5252961f47f281cfe549144b257561e82828e51