| commit | 3c6231011743b4323a4530dd3f07f914e08dda04 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Tue Oct 01 21:04:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 01 21:04:49 2013 -0700 |
| tree | c5a26b7f52e2d3d00e74e163f6f9a8575203f1b6 | |
| parent | a317bf58e1da3d42b395a739a4c4549747229c1e [diff] | |
| parent | 5e375d428c535e94dd451f79ac4b8e5cc822c155 [diff] |
am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE * commit '5e375d428c535e94dd451f79ac4b8e5cc822c155':