Merge change Ib3d582d7 into eclair-mr2

* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.

core/java/android/test/InstrumentationTestCase.java

@@ -166,7 +166,7 @@ public class InstrumentationTestCase extends TestCase {
             getInstrumentation().runOnMainSync(new Runnable() {
                 public void run() {
                     try {
-                        m.invoke(this);                        
+                        m.invoke(InstrumentationTestCase.this);                        
                     } catch (Throwable throwable) {
                         exceptions[0] = throwable;
                     }