| commit | 47a280730c35a6a15ab1320e4ddb661dde2637c9 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Thu Oct 10 00:00:01 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 00:00:01 2013 -0700 |
| tree | c6033e680f290d805cf4f73d483549a154a8b7b7 | |
| parent | d2cb641f4740a8cdb99bc7ca31aee2ed72181e18 [diff] | |
| parent | e90347d5be36bb98c5dbe389cf44a4cd9dd2f619 [diff] |
am e90347d5: (-s ours) 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 'e90347d5be36bb98c5dbe389cf44a4cd9dd2f619':