commit 18c9723c3dad9bd3aaa143ba489a9e0198490b44
author Yorke Lee <yorkelee@google.com> Fri Oct 30 00:38:03 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 30 00:38:03 2015 +0000
tree fde0110fc29b64fb60d45d01e88d88bf2061eb11
parent 1604c1e95d333913081de1ef3f629e7fb31a18da
parent d0a33880c4ee67af7dd3614eccb1c9068b48dcf1

Merge "Point to correct R file in ContactsCommon tests" into ub-contactsdialer-a-dev

tests/src/com/android/contacts/common/model/account/AccountTypeTest.java

diff --git a/tests/src/com/android/contacts/common/model/account/AccountTypeTest.java b/tests/src/com/android/contacts/common/model/account/AccountTypeTest.java
index 6a40611..e204722 100644
--- a/tests/src/com/android/contacts/common/model/account/AccountTypeTest.java
+++ b/tests/src/com/android/contacts/common/model/account/AccountTypeTest.java
@@ -20,7 +20,7 @@
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
-import com.android.contacts.common.R;
+import com.android.contacts.common.tests.R;
 
 /**
  * Test case for {@link AccountType}.

tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java

diff --git a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java b/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
index dc3da45..3265162 100644
--- a/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
+++ b/tests/src/com/android/contacts/common/model/account/ExternalAccountTypeTest.java
@@ -33,7 +33,7 @@
 import android.util.Log;
 
 import com.android.contacts.common.model.dataitem.DataKind;
-import com.android.contacts.common.R;
+import com.android.contacts.common.tests.R;
 import com.google.common.base.Objects;
 
 import java.util.List;