tree 115d3405aa7577d6542968434ec1e74dd36df7b0
parent bb1e8f0a07c12a8b0a2dd3cab6a1a7e825a54c6f
parent 47d237a4b1a41772005c60083e72fe75c0aa0743
author Brian Carlstrom <bdc@google.com> 1318976511 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318976511 -0700

Merge "Fix deadlock on dex_lock_ in ClassLinker::RegisterDexFile" into dalvik-dev