am c0829fc9: (-s ours) am 7b04830a: am 80f7e83f: am 78115b68: am c03da3e8: Fix breakpoint handling on switch statements.

Merge commit 'c0829fc9cd9dc4bc04db166df419931d40e72897' into dalvik-dev

* commit 'c0829fc9cd9dc4bc04db166df419931d40e72897':
  Fix breakpoint handling on switch statements.