Merge "Modifying shortcut display names to be more descriptive" into nyc-dev
tree: b3b3e1248a3aead35aee89be44fb978a9ad7b558
  1. res-common/
  2. src/
  3. tests/