Merge "Workaround for Issue 7250540" into dalvik-dev
tree: 820e9923aa381f3ba17090fee710bdf742ef83fc
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk