diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-01-25 11:00:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 11:00:24 -0800 |
| commit | f2b7c84468c5397b44566c393bec2675d73817b7 (patch) | |
| tree | 5f586564c7394f81b4c53f835a7f60cb1e85658e /core/java/android/webkit/CacheManager.java | |
| parent | 8952df72402d8edbc60a0285f0dc7e8fce29a96f (diff) | |
| parent | 8d37c4efeb853fdc6626f89b5bc0ec79eb451162 (diff) | |
am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit '8d37c4efeb853fdc6626f89b5bc0ec79eb451162':
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 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 |