Merge "Fix a concurrency bug."
tree: 6f9c548a7a3a6fb461424a07370e9fcd9e430711
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk