am e063e1b2: Merge "Fix a unit test"

* commit 'e063e1b218ee8fddb0bd7d4b3b4e71052b57bb2b':
  Fix a unit test
tree: b4cd3de7ee518e9d96cf09f84e72b63ac169ade9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk