| commit | 66d9e9aa2c3761c48c917d1eddedcdfd1a7a1b90 | [log] [tgz] |
|---|---|---|
| author | Daulet Zhanguzin <dauletz@google.com> | Thu Feb 11 15:53:23 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 11 15:53:23 2021 +0000 |
| tree | 4c84d1e3d1f21e80163fa1787553a80975144ac7 | |
| parent | 809cbfe9ff87a7f973f049af8181a2a7152010c1 [diff] | |
| parent | c9bee74abdae530b17a63ea934a007ba0e82c80c [diff] |
Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 am: c9bee74abd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ida4fef6fdc927a2b9a7547bd1eaf509fa725b0aa
diff --git a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java index 9eab024..8f2d93d 100644 --- a/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java +++ b/tests/cts/net/src/android/net/cts/Ikev2VpnTest.java
@@ -55,7 +55,7 @@ import androidx.test.InstrumentationRegistry; import com.android.internal.util.HexDump; -import com.android.org.bouncycastle.x509.X509V1CertificateGenerator; +import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRunner;