am 248dcdf0: Merge "Fix a test."

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