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

* commit '1e113c1325de5cc5e1f0956e60652eefd88b2813':
main
Keisuke Kuroyanagi 2013-10-01 20:59:24 -07:00 committed by Android Git Automerger
commit 5e375d428c

Diff Content Not Available