| commit | d6d37c159bb8ffe7dbc164da534bdbb42da3c880 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Thu Oct 10 08:29:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 08:29:35 2013 -0700 |
| tree | 50705ace8779dc88d4e32494aec0bc763193a308 | |
| parent | 31e91dc16c94bf8b751a3df12301a6ed322c0297 [diff] | |
| parent | 9465a3b276c5b6602782d40e1d5f212e1feccdde [diff] |
am 9465a3b2: am 6ef9e109: am 69cb5213: am 507ba65c: am 1eaddbdc: am 20478247: am c8a82edf: am a4c73066: am ef084229: Merge "Use reentrant lock for main dictionaries." * commit '9465a3b276c5b6602782d40e1d5f212e1feccdde':