Merge "Actually add shortcut-only entries."
tree: 58efd875ff43c4413c56482153de62c6279b45e8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk