Merge "Fix image size regression" into dalvik-dev
tree: 54fbf11445e378082132e5dcae0944a222709a5d
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk