| commit | 69de823eee2583f5978a257b9dac78bcb88f5d05 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 22:41:15 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 22:41:15 2013 -0700 |
| tree | 4f215378dbc96e139e12902a3c5387a1ee112011 | |
| parent | a07ca2fbba86243df14655bc4a263ec85a8fb861 [diff] | |
| parent | 472bace7dbb28a8691455fff265a2b0aaa511132 [diff] |
am 472bace7: (-s ours) am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '472bace7dbb28a8691455fff265a2b0aaa511132':