diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-01-25 11:03:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 11:03:52 -0800 |
| commit | aa16a0f357ab2a222c3a1ca1163b1570d878094f (patch) | |
| tree | d6dd7d3ea0381f25f24b2cf503667aeb3d07ba4a /core/java/android/webkit/CacheManager.java | |
| parent | acd65ba837c0cb05ae63147273d73a73c5cb1d6d (diff) | |
| parent | f2b7c84468c5397b44566c393bec2675d73817b7 (diff) | |
am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
Diffstat (limited to 'core/java/android/webkit/CacheManager.java')
| -rw-r--r-- | core/java/android/webkit/CacheManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index 527a1869baa5..04062fe7cd39 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 |