Merge "Reinstate the shortcut-only attribute" into jb-mr1-dev
tree: e9ee5b98720fa371f769119e6fbec31020843538
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk