am 0c207144: Merge "Fix a bug with a concurrent modification of a map." into jb-dev

* commit '0c20714403d3548d1500cf8ac30041bedeae23d5':
  Fix a bug with a concurrent modification of a map.
tree: a0f3e1cdc2e1a4121ba1ea57951d0a6058398e25
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk