Combining ContactListActivity and TwoPaneActivity into one.

Change-Id: I2ab37a0c87bf26c56cef6946fb53814a70e0ac85
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a0a2ab7..c5811ec 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -167,6 +167,7 @@
         <activity android:name=".activities.ContactListActivity"
             android:label="@string/contactsList"
             android:clearTaskOnLaunch="true"
+            android:theme="@android:style/Theme.NoTitleBar"
         >
             <intent-filter>
                 <action android:name="com.android.contacts.action.LIST_DEFAULT" />
@@ -389,12 +390,6 @@
             </intent-filter>
         </activity>
 
-        <!-- Shows the List and Details in two panes. This is probably temporary -->
-        <activity android:name=".activities.TwoPaneActivity"
-            android:label="Contacts Goop"
-            android:theme="@style/TallTitleBarTheme">
-        </activity>
-
         <!-- Create a new or edit an existing contact -->
         <activity
             android:name=".activities.ContactEditorActivity"