am 03335af0: am 567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread

Merge commit '03335af0dbf14d1eb4503be92a5b10199719898c'

* commit '03335af0dbf14d1eb4503be92a5b10199719898c':
  Fix NPE when handling certain kinds of ANRs.