resolved conflicts for merge of 081a136d to eclair

diff --cc api/current.xml
Simple merge

diff --cc core/java/android/app/SearchManager.java
Simple merge

diff --cc core/res/res/values/attrs.xml
index 729b1db,d5f8dcb..403d07d
--- 1/core/res/res/values/attrs.xml
--- 2/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@@ -2936,8 -2882,8 +2936,8 @@@
               results for "bo", it would not be queried again for "bob".
               The default value is <code>false</code>. <i>Optional attribute.</i>. -->
          <attr name="queryAfterZeroResults" format="boolean" />
 -        
 +
-         <!-- If provided, this string will be used to describe the searchable item in the
+         <!-- @hide If provided, this string will be used to describe the searchable item in the
               searchable items settings within system search settings. <i>Optional
               attribute.</i> -->
          <attr name="searchSettingsDescription" format="string" />

diff --cc core/res/res/values/public.xml
Simple merge