commit 2078bc2358031ef3a191900d9036daf4251911c1
author Matthew Fritze <mfritze@google.com> Mon May 22 13:31:54 2017 -0700
committer Matthew Fritze <mfritze@google.com> Tue May 23 13:57:28 2017 -0700
tree 8d2868ec4e5ba52fc6f90006fe06b25de745e798
parent 45727458f94e67eb9edd7e750e41cca427fcfedb

Remove search2 package and put everything into search

Change-Id: Ie8651c79ef023f154cd7120a88a20f3481abce2b
Fixes: 38502743
Test: make RunSettingsRoboTests

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b04c8ab..649c14f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -206,7 +206,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".search2.SearchActivity"
+        <activity android:name=".search.SearchActivity"
                   android:label="@string/search_settings"
                   android:icon="@drawable/ic_search_history"
                   android:parentActivityName="Settings">