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