am 7db7e6a0: Merge change I17f45d35 into eclair

Merge commit '7db7e6a00c5a0b38bb2077d93a009581941884d3' into eclair-plus-aosp

* commit '7db7e6a00c5a0b38bb2077d93a009581941884d3':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT

api/current.xml

@@ -24317,6 +24317,17 @@
  visibility="public"
 >
 </field>
+<field name="SUGGEST_PARAMETER_LIMIT"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;limit&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="SUGGEST_URI_PATH_QUERY"
  type="java.lang.String"
  transient="false"

core/java/android/app/SearchManager.java

@@ -1592,8 +1592,7 @@ public class SearchManager
 
     /**
      * Query parameter added to suggestion queries to limit the number of suggestions returned.
-     *
-     * @hide Pending API council approval
+     * This limit is only advisory and suggestion providers may chose to ignore it.
      */
     public final static String SUGGEST_PARAMETER_LIMIT = "limit";