commit c3169defa19a824f69b455b5e672931680a194b9
author Leon Scroggins III <scroggo@google.com> Tue Sep 14 12:59:12 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 14 12:59:12 2010 -0700
tree ece0e2eb92cb3057ca672ca8b98e361425d48328
parent 0ba7b925618a9e6e7e6f601119b9849527d9ee39
parent 6002de426803b901c93c76e488b31e7b560436f6

am 6002de42: am 6248bff9: Merge "Remove an incorrect javadoc comment." into froyo

Merge commit '6002de426803b901c93c76e488b31e7b560436f6' into gingerbread-plus-aosp

* commit '6002de426803b901c93c76e488b31e7b560436f6':
  Remove an incorrect javadoc comment.

src/com/android/browser/search/OpenSearchSearchEngine.java

diff --git a/src/com/android/browser/search/OpenSearchSearchEngine.java b/src/com/android/browser/search/OpenSearchSearchEngine.java
index 3c1cd5b..a19e50d 100644
--- a/src/com/android/browser/search/OpenSearchSearchEngine.java
+++ b/src/com/android/browser/search/OpenSearchSearchEngine.java
@@ -168,7 +168,6 @@
      * Executes a GET request and returns the response content.
      *
      * @param url Request URI.
-     * @param requestHeaders Request headers.
      * @return The response content. This is the empty string if the response
      *         contained no content.
      */