Merge "Remove disable card marks, fix SetPatchLocation." into dalvik-dev
tree: f91c0c46526cbce22792940bf3408279f005608c
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk