am a56a3528: am f2f68760: Merge change Ib3d582d7 into eclair-mr2

Merge commit 'a56a3528ae8e42cf01dd0d5c5a1585a90f117011'

* commit 'a56a3528ae8e42cf01dd0d5c5a1585a90f117011':
  Fix crash with @UiThreadTest in InstrumentationTestCase.