tree 92f961a336864049c63a407ef86e62393775f750
parent 23915ddde9ce3ed9f1ce50ea321c8fdce612faf0
parent f2f68760eb10b52bd53d6a266f9b5e2b06037d9f
author Romain Guy <romainguy@android.com> 1260481811 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260481811 -0800

am f2f68760: Merge change Ib3d582d7 into eclair-mr2

Merge commit 'f2f68760eb10b52bd53d6a266f9b5e2b06037d9f' into eclair-mr2-plus-aosp

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