Merge "Fix a silly bug." into jb-mr1-dev
tree: d5280b06ff3e6ec96d8cb7e8ff34d2a753bdea58
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk