am 04bb419c: am ddafcf82: Merge "Fix bugs and add tests"

* commit '04bb419c3290d059c5ccd5e1eda8600d44a0a69d':
  Fix bugs and add tests
tree: 7ccb2352d03529492342bf0db34834079d9c996c
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk