| commit | 750fc3cb227be627af0f50f00ea19ef3a2f63673 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 17:54:11 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 17:54:11 2013 -0700 |
| tree | 5b101a644f83084a49569e50271a21146ad572e5 | |
| parent | 183718f2762fa7616899770124c943c97f8f138a [diff] | |
| parent | eff90276f13fabe46bc59828e4db83fea85413a9 [diff] |
am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit 'eff90276f13fabe46bc59828e4db83fea85413a9':