diff options
| author | Kenny Root <kroot@google.com> | 2013-04-29 23:09:03 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 23:09:03 -0700 |
| commit | e9ae6822a80cb1f3bd13c785f1727c03d35da52e (patch) | |
| tree | b1458872d38a68b06c277276a3062bac0247509d /keystore/java/android/security/KeyChain.java | |
| parent | be53f1806cf9f0ec69f785a0063227e0ed795eb8 (diff) | |
| parent | 1f6e789b7ee9698ab8c528a393c28cce500ace04 (diff) | |
resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
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 c99dff02e97f..6c10287be75a 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 |