am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE

* commit '5e375d428c535e94dd451f79ac4b8e5cc822c155':
This commit is contained in:
Keisuke Kuroyanagi 2013-10-01 21:04:49 -07:00 committed by Android Git Automerger
commit 3c62310117

Diff content is not available