am c9265364: Merge "Enable the rest of branch fusing" into ics-mr1-plus-art

* commit 'c92653641c1334bc50e52d0f1a04201651ad312e':
  Enable the rest of branch fusing
tree: 5fa2d08b0ef5695621c0c36a8346433266d925e5
  1. build/
  2. jdwpspy/
  3. src/
  4. test/
  5. tools/
  6. .gitignore
  7. Android.mk