Merge "Fix a possible deadlock."
tree: ee70bb125b38703b099149eeebd3322bb9514bbc
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk