Merge "Show empty options in shortcut chooser dialog if shortPreference is unchecked." into rvc-dev am: 68084f39d0 am: 957fffe089 am: 1c2d9cdf77 am: ee837a5e30
Change-Id: Id71e942a507ec89bc557a24dcf1981760132b127
This commit is contained in: