Merge "Improve heap lock annotations." into dalvik-dev
tree: 07e3d9c488605736ae0a0051912c4280ba771a24
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk