summaryrefslogtreecommitdiffstats
path: root/preloaded-classes
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2010-04-10 11:47:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-10 11:47:45 -0700
commit86b0276a39d1ca1472e09d4c3787f5ff8f49a1d9 (patch)
tree02f751df2343dfcddc108cf512d0ad974d0d0e87 /preloaded-classes
parent1064a13181c8bfca2e7ab0a3b255a0e88499e0d7 (diff)
parentf9e90378d50210298d1cec2b913653597cd62be4 (diff)
downloadframeworks_base-86b0276a39d1ca1472e09d4c3787f5ff8f49a1d9.zip
frameworks_base-86b0276a39d1ca1472e09d4c3787f5ff8f49a1d9.tar.gz
frameworks_base-86b0276a39d1ca1472e09d4c3787f5ff8f49a1d9.tar.bz2
am f9e90378: am bc284a5f: Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Merge commit 'f9e90378d50210298d1cec2b913653597cd62be4' into kraken * commit 'f9e90378d50210298d1cec2b913653597cd62be4': Move the public method HttpDateTime.parse() into AndroidHttpClient.
Diffstat (limited to 'preloaded-classes')
-rw-r--r--preloaded-classes2
1 files changed, 1 insertions, 1 deletions
diff --git a/preloaded-classes b/preloaded-classes
index 5d2fd68..3a27bac 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -312,7 +312,7 @@ android.net.http.AndroidHttpClientConnection
android.net.http.EventHandler
android.net.http.Headers
android.net.http.HttpsConnection
-android.net.http.HttpDateTime
+com.android.internal.http.HttpDateTime
android.net.http.Request
android.net.http.RequestQueue
android.net.http.SslCertificate