Merge "Fix an infinite loop" into jb-mr2-dev
tree: 1e117e9bfb1a096803c3d78f14d0530f12938edc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk