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