commit a7978d5bc3fcbe62a40e59e29aebea668385a98a
author Marcus Hagerott <mhagerott@google.com> Thu Sep 22 15:31:46 2016 -0700
committer Marcus Hagerott <mhagerott@google.com> Thu Sep 22 15:38:19 2016 -0700
tree 874fe9f9b4dc7d1015b221bea91445914bbddeb6
parent 581585d9ad2e7d3d4b65798acaa0fa462d30710d
parent 949d4e88400761dac02992978f6b79997b5f0055

resolve merge conflicts of 949d4e8 to master

Change-Id: I399652b6a1b756a8045c1fef092d10581d56400d

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 65be28a..4e53114 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -98,6 +98,11 @@
         android:label="Contacts app tests">
     </instrumentation>
 
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.contacts"
+        android:label="Contacts app tests">
+    </instrumentation>
+
     <instrumentation android:name="com.android.contacts.ContactsLaunchPerformance"
         android:targetPackage="com.android.contacts"
         android:label="Contacts launch performance">