tree 7266b11c76bb027fe71f284677838843bac74514
parent e97ce65d0bf88484379531cbc4ab32bd2a40c988
parent 4efffc5ba69fdf44be1bf2b540e24cd2bd85d18c
author Tony Wickham <twickham@google.com> 1470420931 +0000
committer android-build-merger <android-build-merger@google.com> 1470420931 +0000

Use shortcut disabled message if available.
am: 4efffc5ba6

Change-Id: I4faf0908b93e4093d3a9d31a496f1110bb118b54