Merge "Update runner to AndroidJUnittest"
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 601bc8e..cd66c48 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -22,7 +22,7 @@
         <option name="test-file-name" value="messaging.apk" />
     </target_preparer>
 
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.messaging.test" />
         <option name="runner" value="android.test.InstrumentationTestRunner" />
     </test>