tree a68619442a8b4ae2f84390b462d95b66c0b716a8
parent 9c54f613f43bfb76ecb12006177b37222bdedc63
parent 92c9a352f7b52abbb2c75c63301e3552b3d30b75
author Brian Carlstrom <bdc@google.com> 1340403121 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340403121 -0700

Merge "Ensure we can Mutex::Wait on a recursively locked Mutex" into ics-mr1-plus-art