am 6d2399c0: am 5c057b32: Merge "Fix unit tests."

* commit '6d2399c003264581218913ef48d47732d6eb0a01':
tree: babf61f77d189fad939c6643594f00f5951254fe
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk