diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 04:02:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-04-30 04:02:01 +0000 |
| commit | 1f6e789b7ee9698ab8c528a393c28cce500ace04 (patch) | |
| tree | f94cdb76c346cb3db48f41945b4e3f5c8ba2dc5e /keystore/java/android/security/KeyChain.java | |
| parent | 28d91bdbde63ba1afe3bb67c5466527ec7184217 (diff) | |
| parent | 12e752225aa96888358294be0d725d499a1c9f03 (diff) | |
Merge "Track change to JSSE provider"
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index d7119fff170f..825a06272357 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -37,8 +37,8 @@ import java.util.List; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine; -import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore; +import com.android.org.conscrypt.OpenSSLEngine; +import com.android.org.conscrypt.TrustedCertificateStore; /** * The {@code KeyChain} class provides access to private keys and |