am c840ec9e: am 7cd0ffdd: am 248dcdf0: Merge "Fix a test."

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