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