tree bae8d1d185903ca0fdfdee744a38cd796a2ed739
parent 960a7fe15eb5145237f6d7aca64b469be835b70a
author Tony Wickham <twickham@google.com> 1470353689 -0700
committer Tony Wickham <twickham@google.com> 1470418812 -0700

Use shortcut disabled message if available.

Bug: 30681210
Change-Id: Ibb5fd58e5fc9557b63730bc1e3c3977133769466