summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2010-09-15 11:38:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 11:38:56 -0700
commit28beae80725eace55fd018dd7431d1fedeb10e25 (patch)
tree1c44b75fac3b6b6bf7f7d69f6eaf0032abf1c0b5
parentd1aa9123d3d1046be8f7bf5b69d8ea27231a5769 (diff)
parentc3169defa19a824f69b455b5e672931680a194b9 (diff)
downloadpackages_apps_browser-28beae80725eace55fd018dd7431d1fedeb10e25.zip
packages_apps_browser-28beae80725eace55fd018dd7431d1fedeb10e25.tar.gz
packages_apps_browser-28beae80725eace55fd018dd7431d1fedeb10e25.tar.bz2
am c3169def: am 6002de42: am 6248bff9: Merge "Remove an incorrect javadoc comment." into froyo
Merge commit 'c3169defa19a824f69b455b5e672931680a194b9' * commit 'c3169defa19a824f69b455b5e672931680a194b9': Remove an incorrect javadoc comment.
-rw-r--r--src/com/android/browser/search/OpenSearchSearchEngine.java1
1 files changed, 0 insertions, 1 deletions
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 @@ public class OpenSearchSearchEngine implements SearchEngine {
* 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.
*/