am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE

* commit 'eff90276f13fabe46bc59828e4db83fea85413a9':
This commit is contained in:
Keisuke Kuroyanagi 2013-10-09 17:54:11 -07:00 committed by Android Git Automerger
commit 750fc3cb22

Diff content is not available