diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:50:55 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:50:55 -0700 |
| commit | eb24b3049f75b76e115d4d5a7ba474e3681a09c8 (patch) | |
| tree | 187509314bf970c8f7eeff18703b3a3b5675f5d7 /library/test/src | |
| parent | 0572c7e8a96d3b569813a57b3c5a256bc22e962f (diff) | |
| parent | 0a66748ecfbd8b6360299f7b7720631f7282c194 (diff) | |
| download | multidex-eb24b3049f75b76e115d4d5a7ba474e3681a09c8.tar.gz | |
Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
Bug: 112104996
Change-Id: Iedd4a8fe7ef0233a4395c8c269b80b52b6a97acd
Diffstat (limited to 'library/test/src')
| -rw-r--r-- | library/test/src/androidx/multidex/MultiDexTest.java (renamed from library/test/src/android/support/multidex/MultiDexTest.java) | 2 | ||||
| -rw-r--r-- | library/test/src/androidx/multidex/ZipEntryReader.java (renamed from library/test/src/android/support/multidex/ZipEntryReader.java) | 2 | ||||
| -rw-r--r-- | library/test/src/androidx/multidex/ZipUtilTest.java (renamed from library/test/src/android/support/multidex/ZipUtilTest.java) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/library/test/src/android/support/multidex/MultiDexTest.java b/library/test/src/androidx/multidex/MultiDexTest.java index 62bdc30..656b12a 100644 --- a/library/test/src/android/support/multidex/MultiDexTest.java +++ b/library/test/src/androidx/multidex/MultiDexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; import org.junit.Assert; import org.junit.Test; diff --git a/library/test/src/android/support/multidex/ZipEntryReader.java b/library/test/src/androidx/multidex/ZipEntryReader.java index c10bec5..a16e265 100644 --- a/library/test/src/android/support/multidex/ZipEntryReader.java +++ b/library/test/src/androidx/multidex/ZipEntryReader.java @@ -18,7 +18,7 @@ * ZipConstants from android libcore. */ -package android.support.multidex; +package androidx.multidex; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/library/test/src/android/support/multidex/ZipUtilTest.java b/library/test/src/androidx/multidex/ZipUtilTest.java index 985d97f..39a59ac 100644 --- a/library/test/src/android/support/multidex/ZipUtilTest.java +++ b/library/test/src/androidx/multidex/ZipUtilTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.support.multidex; +package androidx.multidex; -import android.support.multidex.ZipUtil.CentralDirectory; +import androidx.multidex.ZipUtil.CentralDirectory; import org.junit.Assert; import org.junit.BeforeClass; |