| commit | 5e375d428c535e94dd451f79ac4b8e5cc822c155 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Tue Oct 01 20:59:24 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 01 20:59:24 2013 -0700 |
| tree | da402142406e14ccffadd90a827d06dccc040b28 | |
| parent | 6bbaf2f812251b9360d87e8b2d9c2f4769a11d89 [diff] | |
| parent | 1e113c1325de5cc5e1f0956e60652eefd88b2813 [diff] |
am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE * commit '1e113c1325de5cc5e1f0956e60652eefd88b2813':