| commit | 2d8f1ca8c21e1efd72ada123792fde731418232f | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 19:32:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 19:32:40 2013 -0700 |
| tree | 5b101a644f83084a49569e50271a21146ad572e5 | |
| parent | 1f3218756b5e9581f984b4f5c907d1acaebae25e [diff] | |
| parent | 193fea55d98b3964f1c8d7174e39abc40bb0633e [diff] |
am 193fea55: am 358e152b: am e95262a8: (-s ours) am 847fdcf7: (-s ours) am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '193fea55d98b3964f1c8d7174e39abc40bb0633e':