summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/KeyChain.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-04-23 22:34:24 -0700
committerKenny Root <kroot@google.com>2013-04-29 15:15:27 -0700
commit12e752225aa96888358294be0d725d499a1c9f03 (patch)
treed716c7eedc50ccdf146aaca9b55fae969cf753ec /keystore/java/android/security/KeyChain.java
parent28b1f0ee02e14241ffb81f431fc54053771c1c90 (diff)
Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
-rw-r--r--keystore/java/android/security/KeyChain.java4
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