am f9ff4fb5: Merge "Revert "Only add spaces automatically when appropriate."" into jb-mr1.1-dev

* commit 'f9ff4fb5da5971bd02eec491a497006540e1438a':
  Revert "Only add spaces automatically when appropriate."
tree: 91607f0a5a9c60d2573b1b6eb2128a20d880f6b5
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk