am 3f124cc5: am 22cd420b: Merge "Improve debug output when an ANR happens." into gingerbread

Merge commit '3f124cc5ec31024acac057d0f848125f8da5e905'

* commit '3f124cc5ec31024acac057d0f848125f8da5e905':
  Improve debug output when an ANR happens.