am 20478247: am c8a82edf: am a4c73066: am ef084229: Merge "Use reentrant lock for main dictionaries."

* commit '2047824739b12a6f3d5fd8a2fe49f5a689207153':
main
Keisuke Kuroyanagi 2013-10-03 16:42:39 -07:00 committed by Android Git Automerger
commit 1eaddbdc2b

Diff Content Not Available