| commit | c9bee74abdae530b17a63ea934a007ba0e82c80c | [log] [tgz] |
|---|---|---|
| author | Daulet Zhanguzin <dauletz@google.com> | Thu Feb 11 15:05:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 11 15:05:16 2021 +0000 |
| tree | 5ea54cd1b312aaf435a2f27c1f093f43f7a9101a | |
| parent | 4fbac43be8e4bb2b8a7c6917560506576cf9fb07 [diff] | |
| parent | e1f96f3c35a6f7ca7e6a637befb548036798e378 [diff] |
Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibbd2aad92bb7fe3fd09de99d82dbb1178daef43c
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;