am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE

* commit 'e95262a8754f9799dd014a19389109b4195bd9a6':
main
Keisuke Kuroyanagi 2013-10-01 23:13:30 -07:00 committed by Android Git Automerger
commit 358e152b10

Diff Content Not Available