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

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