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