Merge "Fix overlap bug" into dalvik-dev
tree: 12851cc01bec8f78440b91bb4ad2bdf86164b505
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk