commit 28beae80725eace55fd018dd7431d1fedeb10e25
author Leon Scroggins III <scroggo@google.com> Wed Sep 15 11:38:56 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 15 11:38:56 2010 -0700
tree 1c44b75fac3b6b6bf7f7d69f6eaf0032abf1c0b5
parent d1aa9123d3d1046be8f7bf5b69d8ea27231a5769
parent c3169defa19a824f69b455b5e672931680a194b9

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

Merge commit 'c3169defa19a824f69b455b5e672931680a194b9'

* commit 'c3169defa19a824f69b455b5e672931680a194b9':
  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.
      */