| commit | 193fea55d98b3964f1c8d7174e39abc40bb0633e | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 17:54:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 17:54:35 2013 -0700 |
| tree | 5b101a644f83084a49569e50271a21146ad572e5 | |
| parent | 1a33d3eb6e1c3ddefc860eb6f3030d862f473e5e [diff] | |
| parent | 358e152b1081f0e74693651e9b5137bd6c2dbad6 [diff] |
am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '358e152b1081f0e74693651e9b5137bd6c2dbad6':