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

* commit 'e3547be8d0602df4b85fb8c09b17407e85ba0933':
main
Keisuke Kuroyanagi 2013-12-13 04:13:40 +00:00 committed by Android Git Automerger
commit 917117e8d6

Diff Content Not Available