commit 1fdaab2778340a74a32221f3e58acce2d3c95870
author Doug Zongker <dougz@android.com> Wed Feb 03 11:21:27 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 03 11:21:27 2010 -0800
tree 0e91c5fe60ae941b0178e3a4d9620da3dfb55661
parent 378a1488bb76d4786025a10e36c2d638cbd2cb6a
parent 7ad12a5f44253dc535f9a25ceb029579b40c43b1

Merge "move HttpDateTime from android.webkit to android-common jar"

common/java/com/android/common/HttpDateTime.java

diff --git a/core/java/android/webkit/HttpDateTime.java b/common/java/com/android/common/HttpDateTime.java
similarity index 99%
rename from core/java/android/webkit/HttpDateTime.java
rename to common/java/com/android/common/HttpDateTime.java
index 042953c..f4052cc 100644
--- a/core/java/android/webkit/HttpDateTime.java
+++ b/common/java/com/android/common/HttpDateTime.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.webkit;
+package com.android.common;
 
 import android.text.format.Time;
 

core/java/android/webkit/CacheManager.java

diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java
index 213eaa5..87cab3c 100644
--- a/core/java/android/webkit/CacheManager.java
+++ b/core/java/android/webkit/CacheManager.java
@@ -30,6 +30,8 @@
 import java.util.ArrayList;
 import java.util.Map;
 
+import com.android.common.HttpDateTime;
+
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.SHA1Digest;
 

core/java/android/webkit/CookieManager.java

diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java
index fca591f..94bedde 100644
--- a/core/java/android/webkit/CookieManager.java
+++ b/core/java/android/webkit/CookieManager.java
@@ -20,6 +20,8 @@
 import android.net.WebAddress;
 import android.util.Log;
 
+import com.android.common.HttpDateTime;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;