commit 6002de426803b901c93c76e488b31e7b560436f6
author Leon Scroggins III <scroggo@google.com> Tue Sep 14 12:56:08 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 14 12:56:08 2010 -0700
tree 3f90e6966b7d7dfa2c58dd08016acbf0a3eb1eac
parent 680ee91f725ac91a37791a4c57c7810c33e76e38
parent 6248bff91a445c29df38f54d05b494a0e4f19897

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

Merge commit '6248bff91a445c29df38f54d05b494a0e4f19897' into gingerbread

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