| commit | 358e152b1081f0e74693651e9b5137bd6c2dbad6 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Tue Oct 01 23:13:30 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 01 23:13:30 2013 -0700 |
| tree | c5a26b7f52e2d3d00e74e163f6f9a8575203f1b6 | |
| parent | a1ff53fb5b6f08d15c619a90241dc1064a381443 [diff] | |
| parent | e95262a8754f9799dd014a19389109b4195bd9a6 [diff] |
am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit 'e95262a8754f9799dd014a19389109b4195bd9a6':