Moving ContactsListActivity to a different package

Change-Id: Ia8b850ed0be700458e741461ab9ea48508bbbf0b
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6544e07..a0a2ab7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -163,8 +163,8 @@
             </intent-filter>
         </activity-alias>
 
-        <!-- The actual list of contacts, usually embedded in ContactsActivity -->
-        <activity android:name="ContactsListActivity"
+        <!-- The actual list of contacts -->
+        <activity android:name=".activities.ContactListActivity"
             android:label="@string/contactsList"
             android:clearTaskOnLaunch="true"
         >
@@ -241,6 +241,11 @@
             </intent-filter>
         </activity>
 
+        <!-- Backwards compatibility: somebody may have hard coded this activity name -->
+        <activity-alias android:name="ContactsListActivity"
+            android:targetActivity=".activities.ContactListActivity"
+        />
+
         <!-- An activity for joining contacts -->
         <activity android:name="JoinContactActivity"
             android:theme="@style/TallTitleBarTheme"