Merge "Fix a deadlock caused by my big threading change yesterday." into dalvik-dev
tree: 8d845941c908b6ef33e2b27add49c56da5a1f2b2
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk