| commit | e3547be8d0602df4b85fb8c09b17407e85ba0933 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 23:59:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 23:59:34 2013 -0700 |
| tree | c6033e680f290d805cf4f73d483549a154a8b7b7 | |
| parent | 012d67765ad19102f93e914c6d0e3bd0371f2090 [diff] | |
| parent | ad51305a4408f64454a6a0f963e3f17d86bbfdf6 [diff] |
am ad51305a: (-s ours) am db9a3e2f: (-s ours) am c53202b4: am 3c623101: am 5e375d42: (-s ours) am 1e113c13: (-s ours) am e628cd3c: Use reentrant lock for main dictionaries. DO NOT MERGE * commit 'ad51305a4408f64454a6a0f963e3f17d86bbfdf6':