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

* commit '472bace7dbb28a8691455fff265a2b0aaa511132':
main
Keisuke Kuroyanagi 2013-10-09 22:41:15 -07:00 committed by Android Git Automerger
commit 69de823eee

Diff Content Not Available