commit | ca67d5dfb2f5a66041eb85180590eb41d3721678 | [log] [tgz] |
---|---|---|
author | Brian Carlstrom <bdc@google.com> | Fri Jun 22 15:14:50 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 22 15:14:50 2012 -0700 |
tree | 402610197b7b5561666b191f05180faf23af5f8d | |
parent | 8d9bc34947892f6c30e29f12e66fed39f5155bd7 [diff] | |
parent | 80a72369d74b31c9620bd148508ee893538c2695 [diff] |
am 80a72369: Merge "Ensure we can Mutex::Wait on a recursively locked Mutex" into ics-mr1-plus-art * commit '80a72369d74b31c9620bd148508ee893538c2695': Ensure we can Mutex::Wait on a recursively locked Mutex