summaryrefslogtreecommitdiff
path: root/core/java/android/webkit/CacheManager.java
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2011-01-25 10:58:02 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-25 10:58:02 -0800
commit8d37c4efeb853fdc6626f89b5bc0ec79eb451162 (patch)
tree75840fc6681cdb841169c6b626b815d85db9233b /core/java/android/webkit/CacheManager.java
parentb6b15dca725b3467ea03fa4c0ae29e6b6e753b27 (diff)
parent4140faeebbfa23d56068c1862b2913fb62145f4f (diff)
Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
Diffstat (limited to 'core/java/android/webkit/CacheManager.java')
-rw-r--r--core/java/android/webkit/CacheManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java
index a553a4592720..e440eb90eef0 100644
--- a/core/java/android/webkit/CacheManager.java
+++ b/core/java/android/webkit/CacheManager.java
@@ -33,8 +33,8 @@ import java.util.List;
import java.util.Map;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+import com.android.org.bouncycastle.crypto.Digest;
+import com.android.org.bouncycastle.crypto.digests.SHA1Digest;
/**
* The class CacheManager provides the persistent cache of content that is