Merge "Fix a failing test."
tree: ad18612e07a77911b6e4f6d32c8b6af9f8ed43cc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk