tree 8d845941c908b6ef33e2b27add49c56da5a1f2b2
parent 3a5c1ce3f11805a3382046f699c8fb1410a602b3
parent a4060e5fe4729fa30bde965efc35779690478fa4
author Ian Rogers <irogers@google.com> 1330736587 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1330736587 -0800

Merge "Fix a deadlock caused by my big threading change yesterday." into dalvik-dev