| commit | 847fdcf7089941c6ded7635c6e3a508d092a0557 | [log] [tgz] |
|---|---|---|
| author | Keisuke Kuroyanagi <ksk@google.com> | Tue Oct 01 22:22:04 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 01 22:22:04 2013 -0700 |
| tree | f654bf5c54a068d69402c485e7d59c6a4d6fbcf0 | |
| parent | 2913ce4141be93962ed488495ff3cbcdb74f7cb7 [diff] | |
| parent | 2f14418c3176caa09d646d95e5556c11e3b86549 [diff] |
am 2f14418c: am e628cd3c: (-s ours) Use reentrant lock for main dictionaries. DO NOT MERGE * commit '2f14418c3176caa09d646d95e5556c11e3b86549':