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 /core/java/android/webkit | |
| parent | be53f1806cf9f0ec69f785a0063227e0ed795eb8 (diff) | |
| parent | 1f6e789b7ee9698ab8c528a393c28cce500ace04 (diff) | |
| download | frameworks_base-e9ae6822a80cb1f3bd13c785f1727c03d35da52e.zip frameworks_base-e9ae6822a80cb1f3bd13c785f1727c03d35da52e.tar.gz frameworks_base-e9ae6822a80cb1f3bd13c785f1727c03d35da52e.tar.bz2 | |
resolved conflicts for merge of 1f6e789b to jb-mr2-dev-plus-aosp
Change-Id: I06c05d637613215b6d83df3e29cd495f6a5a0176
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 4 | ||||
| -rw-r--r-- | core/java/android/webkit/ClientCertRequestHandler.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 0b384bf..6955d14 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -55,8 +55,8 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKey; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder; +import com.android.org.conscrypt.OpenSSLKey; +import com.android.org.conscrypt.OpenSSLKeyHolder; class BrowserFrame extends Handler { diff --git a/core/java/android/webkit/ClientCertRequestHandler.java b/core/java/android/webkit/ClientCertRequestHandler.java index f5a60f6..d7a6806 100644 --- a/core/java/android/webkit/ClientCertRequestHandler.java +++ b/core/java/android/webkit/ClientCertRequestHandler.java @@ -20,9 +20,9 @@ import android.os.Handler; import java.security.PrivateKey; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; -import org.apache.harmony.xnet.provider.jsse.NativeCrypto; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKey; -import org.apache.harmony.xnet.provider.jsse.OpenSSLKeyHolder; +import com.android.org.conscrypt.NativeCrypto; +import com.android.org.conscrypt.OpenSSLKey; +import com.android.org.conscrypt.OpenSSLKeyHolder; /** * ClientCertRequestHandler: class responsible for handling client |