OSDN Git Service

Merge "Use shortcut disabled message if available." into ub-launcher3-calgary
authorTony Wickham <twickham@google.com>
Fri, 5 Aug 2016 18:15:31 +0000 (18:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:15:31 +0000 (18:15 +0000)
am: 37aba27bbc

Change-Id: If5252961f47f281cfe549144b257561e82828e51


Trivial merge