Merge "Revert "Fix a race condition.""
tree: 5b25557f23691339be665bbab753ca1e6bb30f4e
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk