summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-11-29 10:21:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 10:21:23 -0800
commit878da6532836ec09f6d27e8f5af79444c79e78b6 (patch)
treec58b6aa2e7675b9460aea84a4a66011dd1324128
parent565de5f6cb75631f6b23011fcac4fcf8be8d5c5e (diff)
parent9ed4abd875852524c5dd366f30b5b7bda93f0da3 (diff)
downloadframeworks_base-878da6532836ec09f6d27e8f5af79444c79e78b6.zip
frameworks_base-878da6532836ec09f6d27e8f5af79444c79e78b6.tar.gz
frameworks_base-878da6532836ec09f6d27e8f5af79444c79e78b6.tar.bz2
am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error."
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3': Fix AndroidHttpClient documentation error.
-rw-r--r--core/java/android/net/http/AndroidHttpClient.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/net/http/AndroidHttpClient.java b/core/java/android/net/http/AndroidHttpClient.java
index c534e58..fabe018 100644
--- a/core/java/android/net/http/AndroidHttpClient.java
+++ b/core/java/android/net/http/AndroidHttpClient.java
@@ -66,8 +66,7 @@ import android.util.Log;
/**
* Implementation of the Apache {@link DefaultHttpClient} that is configured with
- * reasonable default settings and registered schemes for Android, and
- * also lets the user add {@link HttpRequestInterceptor} classes.
+ * reasonable default settings and registered schemes for Android.
* Don't create this directly, use the {@link #newInstance} factory method.
*
* <p>This client processes cookies but does not retain them by default.