commit | e90347d5be36bb98c5dbe389cf44a4cd9dd2f619 | [log] [tgz] |
---|---|---|
author | Keisuke Kuroyanagi <ksk@google.com> | Wed Oct 09 22:41:38 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 09 22:41:38 2013 -0700 |
tree | 4f215378dbc96e139e12902a3c5387a1ee112011 | |
parent | ee69dfabe32ba5d7e9ffd1a5a3ffc51756a71de2 [diff] | |
parent | 2d8f1ca8c21e1efd72ada123792fde731418232f [diff] |
am 2d8f1ca8: (-s ours) 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 '2d8f1ca8c21e1efd72ada123792fde731418232f':