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/tests | |
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 'keystore/tests')
-rw-r--r-- | keystore/tests/Android.mk | 2 | ||||
-rw-r--r-- | keystore/tests/src/android/security/AndroidKeyStoreTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keystore/tests/Android.mk b/keystore/tests/Android.mk index 61cf640..35388d7 100644 --- a/keystore/tests/Android.mk +++ b/keystore/tests/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests LOCAL_CERTIFICATE := platform -LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle +LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/AndroidKeyStoreTest.java index 8798fb5..b7129db 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/AndroidKeyStoreTest.java @@ -18,7 +18,7 @@ package android.security; import com.android.org.bouncycastle.x509.X509V3CertificateGenerator; -import org.apache.harmony.xnet.provider.jsse.OpenSSLEngine; +import com.android.org.conscrypt.OpenSSLEngine; import android.test.AndroidTestCase; |