Merge "Modifying shortcut display names to be more descriptive" into nyc-dev am: 2cdfdcbbc5
am: 7e9e9100ba

* commit '7e9e9100ba930649dade6ee2f6ca9af1c95787e8':
  Modifying shortcut display names to be more descriptive
tree: b3b3e1248a3aead35aee89be44fb978a9ad7b558
  1. res-common/
  2. src/
  3. tests/