am 243f7f85: am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread

Merge commit '243f7f85ea9e57716590b9cf355e55d1f0236fce'

* commit '243f7f85ea9e57716590b9cf355e55d1f0236fce':
  Improve InstrumentationTestRunner exception handling.