Merge "Avoid cases of deriving information from unresolved types giving conflict." into dalvik-dev
tree: 674da8547698b6c90d81765f8f1a4b27328baff0
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk