tree 7266b11c76bb027fe71f284677838843bac74514
parent 598e1843526e16814eeb4c310c9faec5bc3b7ae9
parent 4efffc5ba69fdf44be1bf2b540e24cd2bd85d18c
author Tony Wickham <twickham@google.com> 1470419855 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1470419855 +0000

Merge "Use shortcut disabled message if available." into ub-launcher3-calgary