Merge "Fix a bug with a concurrent modification of a map." into jb-dev
tree: e9a972dce03a142ae82593dcd8ea54f892bd226d
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk