| commit | db9a3e2fd03a6b2ccad46928265e5568cfee87c9 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 19:32:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 19:32:31 2013 -0700 |
| tree | 5b101a644f83084a49569e50271a21146ad572e5 | |
| parent | 793047bb6024d2865f5b2a6e0af1c0a4cf4b7561 [diff] | |
| parent | c53202b441def12d0a88266c8d7f4467a84061e6 [diff] |
am c53202b4: am 3c623101: am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE * commit 'c53202b441def12d0a88266c8d7f4467a84061e6':