Merge "Reinstate putting shortcut-only entries in the dictionary" into jb-mr1-dev
tree: 40999f9e93ee2eca259ada89c1277f8ee5606f77
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk