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

* commit 'c53202b441def12d0a88266c8d7f4467a84061e6':
main
Keisuke Kuroyanagi 2013-10-09 19:32:31 -07:00 committed by Android Git Automerger
commit db9a3e2fd0

Diff Content Not Available