| commit | 86b5fedf561501a10dfd8b7f0f23f1360825ce34 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 23:59:08 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 23:59:08 2013 -0700 |
| tree | c6033e680f290d805cf4f73d483549a154a8b7b7 | |
| parent | 4671e069778e4c29ba2e98ae445b06701feffaaf [diff] | |
| parent | 69de823eee2583f5978a257b9dac78bcb88f5d05 [diff] |
am 69de823e: (-s ours) am 472bace7: (-s ours) am 750fc3cb: am eff90276: am 9b9d17f9: (-s ours) am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '69de823eee2583f5978a257b9dac78bcb88f5d05':