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