commit 69c182afb0e6d82a341a28b4317aa703af768906
author Gary Mai <garymai@google.com> Mon Dec 05 13:07:03 2016 -0800
committer Gary Mai <garymai@google.com> Mon Dec 05 13:46:31 2016 -0800
tree 1f226ee7dd89f433f78c73699e688ec911363f4e
parent 90d05e21b5c1c4ab67f2ee9f78dce5ecdc260ca7

Collapse common packages (1/?)

Move the majority of packages out of common. When trying to move
common.activity to activities every file switched from a rename to
separated deletes and adds. Will move tests and the rest of common
in a separate CL.

Test: Built GoogleContacts, Contacts, GoogleContactsTests,
ContactsTests.

Bug: 33252370
Change-Id: I9ffb20038dee255ef5f83002b7870265771b08c5

src/com/android/contacts/AppCompatContactsActivity.java

diff --git a/src/com/android/contacts/AppCompatContactsActivity.java b/src/com/android/contacts/AppCompatContactsActivity.java
index 7654b27..e4a24e9 100644
--- a/src/com/android/contacts/AppCompatContactsActivity.java
+++ b/src/com/android/contacts/AppCompatContactsActivity.java
@@ -26,7 +26,7 @@
 import android.view.View;
 
 import com.android.contacts.common.activity.AppCompatTransactionSafeActivity;
-import com.android.contacts.common.testing.InjectedServices;
+import com.android.contacts.testing.InjectedServices;
 
 /**
  * A common superclass for Contacts activities that handles application-wide services, copied from