Merge "Fix a race condition that makes tests unstable"
tree: 601f4e5754276cdc7f0913597b55d1eedaaaab1e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk