resolved conflicts for merge of 6186821c to dalvik-dev

Change-Id: Ic6f0172767d6feedb188d3a5e7488a67702ef8c4

2 files changed, 2 insertions, 2 deletions

diff --git a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
index 5199767..68ec773 100644
--- a/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
+++ b/support/src/test/java/org/apache/harmony/testframework/serialization/SerializationTest.java
@@ -40,7 +40,7 @@ import java.util.Collections;
 import java.util.HashSet;
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import libcore.base.Objects;
+import libcore.util.Objects;
 
 /**
  * Framework for serialization testing. Subclasses only need to override
diff --git a/support/src/test/java/tests/support/resource/Support_Resources.java b/support/src/test/java/tests/support/resource/Support_Resources.java
index 3927883..c1594d4 100644
--- a/support/src/test/java/tests/support/resource/Support_Resources.java
+++ b/support/src/test/java/tests/support/resource/Support_Resources.java
@@ -17,7 +17,7 @@
 
 package tests.support.resource;
 
-import libcore.base.Streams;
+import libcore.io.Streams;
 import tests.support.Support_Configuration;
 
 import java.io.File;