Merge "Try to compensate for a race condition."
tree: 6af4d035760071c19ef36736981ba4e75ace7abc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk