am de5705dc: Merge "Fix "holding ThreadListLock while doing condition variable wait on HeapLock"" into ics-mr1-plus-art

* commit 'de5705dcf4ab5f92d48e144bcd7b59f7bcd18e16':
  Fix "holding ThreadListLock while doing condition variable wait on HeapLock"
tree: 6a18f0640215923efd571196f02a3bfa49c05a34
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk