commit | a04d24f6ede8fbcceb8bd7cf12509c7dfad1feb3 | [log] [tgz] |
---|---|---|
author | Mathieu Chartier <mathieuc@google.com> | Thu Jun 21 15:14:05 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 21 15:14:05 2012 -0700 |
tree | 6a18f0640215923efd571196f02a3bfa49c05a34 | |
parent | 2470eee5e3f5a6878b315e4e7b14a136ac6dd8c8 [diff] | |
parent | de5705dcf4ab5f92d48e144bcd7b59f7bcd18e16 [diff] |
am de5705dc: Merge "Fix "holding ThreadListLock while doing condition variable wait on HeapLock"" into ics-mr1-plus-art * commit 'de5705dcf4ab5f92d48e144bcd7b59f7bcd18e16': Fix "holding ThreadListLock while doing condition variable wait on HeapLock"