resolved conflicts for merge of 6186821c to dalvik-dev

Change-Id: Ic6f0172767d6feedb188d3a5e7488a67702ef8c4

5 files changed, 5 insertions, 6 deletions

diff --git a/luni/src/test/etc/loading-test-jar/TestMethods.java b/luni/src/test/etc/loading-test-jar/TestMethods.java
index fd40163..bc22dc3 100644
--- a/luni/src/test/etc/loading-test-jar/TestMethods.java
+++ b/luni/src/test/etc/loading-test-jar/TestMethods.java
@@ -64,7 +64,7 @@ public class TestMethods {
      * Fully read the contents of the given stream.
      */
     public static byte[] readFully(InputStream in) throws IOException {
-        // This is a copy of the same-named method in libcore.base.Streams.
+        // This is a copy of the same-named method in libcore.io.Streams.
         byte[] buffer = new byte[1024];
         ByteArrayOutputStream bytes = new ByteArrayOutputStream();
         while (true) {
diff --git a/luni/src/test/java/dalvik/system/DexClassLoaderTest.java b/luni/src/test/java/dalvik/system/DexClassLoaderTest.java
index 53cc03c..23aef68 100644
--- a/luni/src/test/java/dalvik/system/DexClassLoaderTest.java
+++ b/luni/src/test/java/dalvik/system/DexClassLoaderTest.java
@@ -22,8 +22,7 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import libcore.base.Streams;
+import libcore.io.Streams;
 import junit.framework.TestCase;
 
 /**
diff --git a/luni/src/test/java/libcore/java/util/jar/DalvikExecTest.java b/luni/src/test/java/libcore/java/util/jar/DalvikExecTest.java
index 02642a7..08ec096 100644
--- a/luni/src/test/java/libcore/java/util/jar/DalvikExecTest.java
+++ b/luni/src/test/java/libcore/java/util/jar/DalvikExecTest.java
@@ -27,7 +27,7 @@ import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
 import junit.framework.TestCase;
-import libcore.base.Streams;
+import libcore.io.Streams;
 import static tests.support.Support_Exec.execAndGetOutput;
 import tests.support.resource.Support_Resources;
 
diff --git a/luni/src/test/java/libcore/base/BasicLruCacheTest.java b/luni/src/test/java/libcore/util/BasicLruCacheTest.java
index 5aa0d72..5c5c1f1 100644
--- a/luni/src/test/java/libcore/base/BasicLruCacheTest.java
+++ b/luni/src/test/java/libcore/util/BasicLruCacheTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package libcore.base;
+package libcore.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/luni/src/test/java/libcore/base/CollectionUtilsTest.java b/luni/src/test/java/libcore/util/CollectionUtilsTest.java
index 1c92a46..7349752 100644
--- a/luni/src/test/java/libcore/base/CollectionUtilsTest.java
+++ b/luni/src/test/java/libcore/util/CollectionUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package libcore.base;
+package libcore.util;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;