| commit | f0adb99511b7c64dba916975d405c63b6fa67952 | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Thu Aug 13 04:09:27 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 13 04:09:27 2020 +0000 |
| tree | 3b59ef00e96402d283cf7eb071e9fc96ed5f620c | |
| parent | 77fd539623435527348ec1dd4e229dc5d0e39671 [diff] | |
| parent | 7356e7384962b0600db22aa8f16fcf48f4336db3 [diff] |
Merge "Rename Kotlin util files to not include the Kt suffix" am: a42b415dc9 Original change: https://android-review.googlesource.com/c/platform/cts/+/1353402 Change-Id: Ib895f34ce8580dbd8daf941243a1a3724bb10582
diff --git a/tests/cts/net/src/android/net/cts/IpConfigurationTest.java b/tests/cts/net/src/android/net/cts/IpConfigurationTest.java index c6bc077..56ab2a7 100644 --- a/tests/cts/net/src/android/net/cts/IpConfigurationTest.java +++ b/tests/cts/net/src/android/net/cts/IpConfigurationTest.java
@@ -16,7 +16,7 @@ package android.net.cts; -import static com.android.testutils.ParcelUtilsKt.assertParcelSane; +import static com.android.testutils.ParcelUtils.assertParcelSane; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull;
diff --git a/tests/cts/net/src/android/net/cts/MacAddressTest.java b/tests/cts/net/src/android/net/cts/MacAddressTest.java index 4d25e62..3fd3bba 100644 --- a/tests/cts/net/src/android/net/cts/MacAddressTest.java +++ b/tests/cts/net/src/android/net/cts/MacAddressTest.java
@@ -20,7 +20,7 @@ import static android.net.MacAddress.TYPE_MULTICAST; import static android.net.MacAddress.TYPE_UNICAST; -import static com.android.testutils.ParcelUtilsKt.assertParcelSane; +import static com.android.testutils.ParcelUtils.assertParcelSane; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertFalse;