summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2014-03-07 01:35:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 01:35:37 +0000
commit6f21cab1769c3789884e9676d333c93287b0efe7 (patch)
tree8c6721c4005cec62d82ed97c38e1d84dc43df64d
parentf74734e52a321d73ff598b0917fcef7f2c44cbf8 (diff)
parentc35abba4e719c7eee7d47e0b883daa67ac830f5c (diff)
downloadlibcore-6f21cab1769c3789884e9676d333c93287b0efe7.zip
libcore-6f21cab1769c3789884e9676d333c93287b0efe7.tar.gz
libcore-6f21cab1769c3789884e9676d333c93287b0efe7.tar.bz2
am c35abba4: Merge "Fixed incorrect class names in golden serialized files for EnumSetTest and EnumMapTest"
* commit 'c35abba4e719c7eee7d47e0b883daa67ac830f5c': Fixed incorrect class names in golden serialized files for EnumSetTest and EnumMapTest
-rw-r--r--harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.serbin270 -> 285 bytes
-rw-r--r--harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.serbin897 -> 912 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
index 76f7668..8151214 100644
--- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
Binary files differ
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
index 66040e5..5271090 100644
--- a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
Binary files differ