am bf61bba3: Merge "Fix two small possible bugs." into jb-dev

* commit 'bf61bba35feda09a2ad08475481ce042879ff5bb':
  Fix two small possible bugs.
tree: 9f63f722bcd495dcd002aa7156c835bef114c60b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk