| commit | ad51305a4408f64454a6a0f963e3f17d86bbfdf6 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 22:41:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 22:41:29 2013 -0700 |
| tree | 4f215378dbc96e139e12902a3c5387a1ee112011 | |
| parent | 2ee4749d9cf5c4f90ea3e4494c0628e94c45e35b [diff] | |
| parent | db9a3e2fd03a6b2ccad46928265e5568cfee87c9 [diff] |
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 'db9a3e2fd03a6b2ccad46928265e5568cfee87c9':