merge more modules into luni

author: Peter Hallam <peterhal@google.com> 2010-04-26 12:53:37 -0700
committer: Peter Hallam <peterhal@google.com> 2010-04-27 16:26:27 -0700
commit: cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd (patch)
tree: e71d43da21749bfeb4524b0adec05c91d1f89a5f
parent: f205f06be1ce65f132be1b7c850675086f26c0f7 (diff)
download: libcore-cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd.zip
libcore-cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd.tar.gz
libcore-cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd.tar.bz2
2038 files changed, 18 insertions, 164 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 94b1b4d..8543240 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -50,7 +50,7 @@ $(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null)
 endef
 
 # The Java files and their associated resources.
-core_src_files := $(call all-main-java-files-under,annotation archive auth awt-kernel concurrent crypto dalvik dom icu json junit logging luni luni-kernel math nio_char openssl prefs regex security security-kernel sql suncompat support text x-net xml)
+core_src_files := $(call all-main-java-files-under,awt-kernel dalvik dom icu json junit luni luni-kernel openssl prefs security-kernel support x-net xml)
 core_resource_dirs := $(call all-core-resource-dirs,main)
 test_resource_dirs := $(call all-core-resource-dirs,test)
 
@@ -104,46 +104,6 @@ include $(BUILD_JAVA_LIBRARY)
 # TODO: DalvikRunner will make this nonsense obsolete.
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,annotation)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-annotation
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,archive)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-archive
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,concurrent)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-concurrent
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-crypto
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,dom)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -164,16 +124,6 @@ LOCAL_MODULE := core-tests-json
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,logging)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-logging
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,luni-kernel)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -194,50 +144,19 @@ LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LIBRARIES := \
         core \
         core-tests-support \
-        core-tests-annotation \
-        core-tests-archive \
-        core-tests-concurrent \
-        core-tests-crypto \
         core-tests-dom \
         core-tests-json \
-        core-tests-logging \
         core-tests-luni-kernel \
-        core-tests-math \
-        core-tests-nio_char \
         core-tests-prefs \
-        core-tests-regex \
-        core-tests-security \
-        core-tests-sql \
-        core-tests-suncompat \
-        core-tests-text \
         core-tests-x-net \
-        core-tests-xml
+        core-tests-xml \
+        sqlite-jdbc
 LOCAL_DX_FLAGS := --core-library
 LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := core-tests-luni
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,math)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-math
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,nio_char)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-nio_char
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,prefs)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -248,46 +167,6 @@ LOCAL_MODULE := core-tests-prefs
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,regex)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-regex
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,security)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-security
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,sql)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support sqlite-jdbc
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-sql
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,suncompat)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-suncompat
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,support)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
@@ -298,16 +177,6 @@ LOCAL_MODULE := core-tests-support
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,text)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-text
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,x-net)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
diff --git a/NativeCode.mk b/NativeCode.mk
index 38ff709..d32307e 100644
--- a/NativeCode.mk
+++ b/NativeCode.mk
@@ -101,7 +101,7 @@ include $(BUILD_STATIC_LIBRARY)
 # Deal with keystores required for security. Note: The path to this file
 # is hardcoded in TrustManagerFactoryImpl.java.
 ALL_PREBUILT += $(TARGET_OUT)/etc/security/cacerts.bks
-$(TARGET_OUT)/etc/security/cacerts.bks : $(LOCAL_PATH)/security/src/main/files/cacerts.bks | $(ACP)
+$(TARGET_OUT)/etc/security/cacerts.bks : $(LOCAL_PATH)/luni/src/main/files/cacerts.bks | $(ACP)
 	$(transform-prebuilt-to-target)
 
 
diff --git a/annotation/MODULE_LICENSE_APACHE2 b/annotation/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/annotation/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/archive/MODULE_LICENSE_APACHE2 b/archive/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/archive/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/archive/src/main/native/hycomp.h b/archive/src/main/native/hycomp.h
deleted file mode 100644
index 029d4fe..0000000
--- a/archive/src/main/native/hycomp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "hy2sie.h"
diff --git a/archive/src/main/native/sub.mk b/archive/src/main/native/sub.mk
deleted file mode 100644
index 694c185..0000000
--- a/archive/src/main/native/sub.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := \
-	java_util_zip_Adler32.c \
-	java_util_zip_CRC32.c \
-	java_util_zip_Deflater.c \
-	java_util_zip_Inflater.c \
-	zip.c \
-	zipalloc.c \
-	sieb.c
-
-LOCAL_C_INCLUDES += \
-	external/zlib
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES += \
-	libz
-
-LOCAL_STATIC_LIBRARIES +=
diff --git a/auth/MODULE_LICENSE_APACHE2 b/auth/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/auth/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/concurrent/MODULE_LICENSE_PUBLIC_DOMAIN b/concurrent/MODULE_LICENSE_PUBLIC_DOMAIN
deleted file mode 100644
index e69de29..0000000
--- a/concurrent/MODULE_LICENSE_PUBLIC_DOMAIN
+++ /dev/null
diff --git a/crypto/MODULE_LICENSE_APACHE2 b/crypto/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/crypto/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/logging/MODULE_LICENSE_APACHE2 b/logging/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/logging/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/security/MODULE_LICENSE_BSD_LIKE b/luni/MODULE_LICENSE_BSD_LIKE
index 3ffcd33..3ffcd33 100644
--- a/security/MODULE_LICENSE_BSD_LIKE
+++ b/luni/MODULE_LICENSE_BSD_LIKE
diff --git a/security/bouncycastle-license.txt b/luni/bouncycastle-license.txt
index cfeef72..cfeef72 100644
--- a/security/bouncycastle-license.txt
+++ b/luni/bouncycastle-license.txt
diff --git a/security/src/main/files/cacerts.bks b/luni/src/main/files/cacerts.bks
index ca45764..ca45764 100644
--- a/security/src/main/files/cacerts.bks
+++ b/luni/src/main/files/cacerts.bks
diff --git a/security/src/main/files/cacerts/03e16f6c.0 b/luni/src/main/files/cacerts/03e16f6c.0
index 748dfa9..748dfa9 100644
--- a/security/src/main/files/cacerts/03e16f6c.0
+++ b/luni/src/main/files/cacerts/03e16f6c.0
diff --git a/security/src/main/files/cacerts/111e6273.0 b/luni/src/main/files/cacerts/111e6273.0
index 908d85c..908d85c 100644
--- a/security/src/main/files/cacerts/111e6273.0
+++ b/luni/src/main/files/cacerts/111e6273.0
diff --git a/security/src/main/files/cacerts/1155c94b.0 b/luni/src/main/files/cacerts/1155c94b.0
index 3fc6648..3fc6648 100644
--- a/security/src/main/files/cacerts/1155c94b.0
+++ b/luni/src/main/files/cacerts/1155c94b.0
diff --git a/security/src/main/files/cacerts/17b51fe6.0 b/luni/src/main/files/cacerts/17b51fe6.0
index c5b47b1..c5b47b1 100644
--- a/security/src/main/files/cacerts/17b51fe6.0
+++ b/luni/src/main/files/cacerts/17b51fe6.0
diff --git a/security/src/main/files/cacerts/1dac3003.0 b/luni/src/main/files/cacerts/1dac3003.0
index 6f7dd03..6f7dd03 100644
--- a/security/src/main/files/cacerts/1dac3003.0
+++ b/luni/src/main/files/cacerts/1dac3003.0
diff --git a/security/src/main/files/cacerts/1dbdda5b.0 b/luni/src/main/files/cacerts/1dbdda5b.0
index fe4a54b..fe4a54b 100644
--- a/security/src/main/files/cacerts/1dbdda5b.0
+++ b/luni/src/main/files/cacerts/1dbdda5b.0
diff --git a/security/src/main/files/cacerts/1dcd6f4c.0 b/luni/src/main/files/cacerts/1dcd6f4c.0
index a428f8b..a428f8b 100644
--- a/security/src/main/files/cacerts/1dcd6f4c.0
+++ b/luni/src/main/files/cacerts/1dcd6f4c.0
diff --git a/security/src/main/files/cacerts/219d9499.0 b/luni/src/main/files/cacerts/219d9499.0
index 688288a..688288a 100644
--- a/security/src/main/files/cacerts/219d9499.0
+++ b/luni/src/main/files/cacerts/219d9499.0
diff --git a/security/src/main/files/cacerts/23f4c490.0 b/luni/src/main/files/cacerts/23f4c490.0
index 8327a4e..8327a4e 100644
--- a/security/src/main/files/cacerts/23f4c490.0
+++ b/luni/src/main/files/cacerts/23f4c490.0
diff --git a/security/src/main/files/cacerts/256fd83b.0 b/luni/src/main/files/cacerts/256fd83b.0
index 39ef065..39ef065 100644
--- a/security/src/main/files/cacerts/256fd83b.0
+++ b/luni/src/main/files/cacerts/256fd83b.0
diff --git a/security/src/main/files/cacerts/2afc57aa.0 b/luni/src/main/files/cacerts/2afc57aa.0
index 31b8092..31b8092 100644
--- a/security/src/main/files/cacerts/2afc57aa.0
+++ b/luni/src/main/files/cacerts/2afc57aa.0
diff --git a/security/src/main/files/cacerts/33815e15.0 b/luni/src/main/files/cacerts/33815e15.0
index aab4c83..aab4c83 100644
--- a/security/src/main/files/cacerts/33815e15.0
+++ b/luni/src/main/files/cacerts/33815e15.0
diff --git a/security/src/main/files/cacerts/399e7759.0 b/luni/src/main/files/cacerts/399e7759.0
index 9bd63b3..9bd63b3 100644
--- a/security/src/main/files/cacerts/399e7759.0
+++ b/luni/src/main/files/cacerts/399e7759.0
diff --git a/security/src/main/files/cacerts/3c58f906.0 b/luni/src/main/files/cacerts/3c58f906.0
index 7500443..7500443 100644
--- a/security/src/main/files/cacerts/3c58f906.0
+++ b/luni/src/main/files/cacerts/3c58f906.0
diff --git a/security/src/main/files/cacerts/3e7271e8.0 b/luni/src/main/files/cacerts/3e7271e8.0
index 62b5b22..62b5b22 100644
--- a/security/src/main/files/cacerts/3e7271e8.0
+++ b/luni/src/main/files/cacerts/3e7271e8.0
diff --git a/security/src/main/files/cacerts/4d654d1d.0 b/luni/src/main/files/cacerts/4d654d1d.0
index 94ed383..94ed383 100644
--- a/security/src/main/files/cacerts/4d654d1d.0
+++ b/luni/src/main/files/cacerts/4d654d1d.0
diff --git a/security/src/main/files/cacerts/4e18c148.0 b/luni/src/main/files/cacerts/4e18c148.0
index be68fd6..be68fd6 100644
--- a/security/src/main/files/cacerts/4e18c148.0
+++ b/luni/src/main/files/cacerts/4e18c148.0
diff --git a/security/src/main/files/cacerts/4fbd6bfa.0 b/luni/src/main/files/cacerts/4fbd6bfa.0
index 988dd3c..988dd3c 100644
--- a/security/src/main/files/cacerts/4fbd6bfa.0
+++ b/luni/src/main/files/cacerts/4fbd6bfa.0
diff --git a/security/src/main/files/cacerts/5021a0a2.0 b/luni/src/main/files/cacerts/5021a0a2.0
index ae6c41b..ae6c41b 100644
--- a/security/src/main/files/cacerts/5021a0a2.0
+++ b/luni/src/main/files/cacerts/5021a0a2.0
diff --git a/security/src/main/files/cacerts/54edfa5d.0 b/luni/src/main/files/cacerts/54edfa5d.0
index e2530a4..e2530a4 100644
--- a/security/src/main/files/cacerts/54edfa5d.0
+++ b/luni/src/main/files/cacerts/54edfa5d.0
diff --git a/security/src/main/files/cacerts/594f1775.0 b/luni/src/main/files/cacerts/594f1775.0
index 1c7d3b0..1c7d3b0 100644
--- a/security/src/main/files/cacerts/594f1775.0
+++ b/luni/src/main/files/cacerts/594f1775.0
diff --git a/security/src/main/files/cacerts/5a5372fc.0 b/luni/src/main/files/cacerts/5a5372fc.0
index fe74cd5..fe74cd5 100644
--- a/security/src/main/files/cacerts/5a5372fc.0
+++ b/luni/src/main/files/cacerts/5a5372fc.0
diff --git a/security/src/main/files/cacerts/5cf9d536.0 b/luni/src/main/files/cacerts/5cf9d536.0
index f429812..f429812 100644
--- a/security/src/main/files/cacerts/5cf9d536.0
+++ b/luni/src/main/files/cacerts/5cf9d536.0
diff --git a/security/src/main/files/cacerts/635ccfd5.0 b/luni/src/main/files/cacerts/635ccfd5.0
index b69711b..b69711b 100644
--- a/security/src/main/files/cacerts/635ccfd5.0
+++ b/luni/src/main/files/cacerts/635ccfd5.0
diff --git a/security/src/main/files/cacerts/69105f4f.0 b/luni/src/main/files/cacerts/69105f4f.0
index ae403f0..ae403f0 100644
--- a/security/src/main/files/cacerts/69105f4f.0
+++ b/luni/src/main/files/cacerts/69105f4f.0
diff --git a/security/src/main/files/cacerts/6e8bf996.0 b/luni/src/main/files/cacerts/6e8bf996.0
index dca7c1e..dca7c1e 100644
--- a/security/src/main/files/cacerts/6e8bf996.0
+++ b/luni/src/main/files/cacerts/6e8bf996.0
diff --git a/security/src/main/files/cacerts/6fe6f9b8.0 b/luni/src/main/files/cacerts/6fe6f9b8.0
index f0cbd5b..f0cbd5b 100644
--- a/security/src/main/files/cacerts/6fe6f9b8.0
+++ b/luni/src/main/files/cacerts/6fe6f9b8.0
diff --git a/security/src/main/files/cacerts/72fa7371.0 b/luni/src/main/files/cacerts/72fa7371.0
index 3dd11b1..3dd11b1 100644
--- a/security/src/main/files/cacerts/72fa7371.0
+++ b/luni/src/main/files/cacerts/72fa7371.0
diff --git a/security/src/main/files/cacerts/74c26bd0.0 b/luni/src/main/files/cacerts/74c26bd0.0
index 0307ae7..0307ae7 100644
--- a/security/src/main/files/cacerts/74c26bd0.0
+++ b/luni/src/main/files/cacerts/74c26bd0.0
diff --git a/security/src/main/files/cacerts/7651b327.0 b/luni/src/main/files/cacerts/7651b327.0
index c0cee71..c0cee71 100644
--- a/security/src/main/files/cacerts/7651b327.0
+++ b/luni/src/main/files/cacerts/7651b327.0
diff --git a/security/src/main/files/cacerts/7a819ef2.0 b/luni/src/main/files/cacerts/7a819ef2.0
index f5bd060..f5bd060 100644
--- a/security/src/main/files/cacerts/7a819ef2.0
+++ b/luni/src/main/files/cacerts/7a819ef2.0
diff --git a/security/src/main/files/cacerts/7d3cd826.0 b/luni/src/main/files/cacerts/7d3cd826.0
index 2c128b1..2c128b1 100644
--- a/security/src/main/files/cacerts/7d3cd826.0
+++ b/luni/src/main/files/cacerts/7d3cd826.0
diff --git a/security/src/main/files/cacerts/81b9768f.0 b/luni/src/main/files/cacerts/81b9768f.0
index 663fc2f..663fc2f 100644
--- a/security/src/main/files/cacerts/81b9768f.0
+++ b/luni/src/main/files/cacerts/81b9768f.0
diff --git a/security/src/main/files/cacerts/9339512a.0 b/luni/src/main/files/cacerts/9339512a.0
index 67cf4d8..67cf4d8 100644
--- a/security/src/main/files/cacerts/9339512a.0
+++ b/luni/src/main/files/cacerts/9339512a.0
diff --git a/security/src/main/files/cacerts/a3896b44.0 b/luni/src/main/files/cacerts/a3896b44.0
index 1dc798e..1dc798e 100644
--- a/security/src/main/files/cacerts/a3896b44.0
+++ b/luni/src/main/files/cacerts/a3896b44.0
diff --git a/security/src/main/files/cacerts/a7605362.0 b/luni/src/main/files/cacerts/a7605362.0
index a3314fc..a3314fc 100644
--- a/security/src/main/files/cacerts/a7605362.0
+++ b/luni/src/main/files/cacerts/a7605362.0
diff --git a/security/src/main/files/cacerts/ab86d4de.0 b/luni/src/main/files/cacerts/ab86d4de.0
index c6f241f..c6f241f 100644
--- a/security/src/main/files/cacerts/ab86d4de.0
+++ b/luni/src/main/files/cacerts/ab86d4de.0
diff --git a/security/src/main/files/cacerts/add67345.0 b/luni/src/main/files/cacerts/add67345.0
index 6bc1f89..6bc1f89 100644
--- a/security/src/main/files/cacerts/add67345.0
+++ b/luni/src/main/files/cacerts/add67345.0
diff --git a/security/src/main/files/cacerts/b0f3e76e.0 b/luni/src/main/files/cacerts/b0f3e76e.0
index 386b70a..386b70a 100644
--- a/security/src/main/files/cacerts/b0f3e76e.0
+++ b/luni/src/main/files/cacerts/b0f3e76e.0
diff --git a/security/src/main/files/cacerts/bae2cbd8.0 b/luni/src/main/files/cacerts/bae2cbd8.0
index 352fc9b..352fc9b 100644
--- a/security/src/main/files/cacerts/bae2cbd8.0
+++ b/luni/src/main/files/cacerts/bae2cbd8.0
diff --git a/security/src/main/files/cacerts/bcdd5959.0 b/luni/src/main/files/cacerts/bcdd5959.0
index b55d346..b55d346 100644
--- a/security/src/main/files/cacerts/bcdd5959.0
+++ b/luni/src/main/files/cacerts/bcdd5959.0
diff --git a/security/src/main/files/cacerts/bda4cc84.0 b/luni/src/main/files/cacerts/bda4cc84.0
index 4795994..4795994 100644
--- a/security/src/main/files/cacerts/bda4cc84.0
+++ b/luni/src/main/files/cacerts/bda4cc84.0
diff --git a/security/src/main/files/cacerts/bf64f35b.0 b/luni/src/main/files/cacerts/bf64f35b.0
index 389623c..389623c 100644
--- a/security/src/main/files/cacerts/bf64f35b.0
+++ b/luni/src/main/files/cacerts/bf64f35b.0
diff --git a/security/src/main/files/cacerts/c33a80d4.0 b/luni/src/main/files/cacerts/c33a80d4.0
index 5262d83..5262d83 100644
--- a/security/src/main/files/cacerts/c33a80d4.0
+++ b/luni/src/main/files/cacerts/c33a80d4.0
diff --git a/security/src/main/files/cacerts/cdaebb72.0 b/luni/src/main/files/cacerts/cdaebb72.0
index 2281720..2281720 100644
--- a/security/src/main/files/cacerts/cdaebb72.0
+++ b/luni/src/main/files/cacerts/cdaebb72.0
diff --git a/security/src/main/files/cacerts/d537fba6.0 b/luni/src/main/files/cacerts/d537fba6.0
index 9a5375c..9a5375c 100644
--- a/security/src/main/files/cacerts/d537fba6.0
+++ b/luni/src/main/files/cacerts/d537fba6.0
diff --git a/security/src/main/files/cacerts/d777342d.0 b/luni/src/main/files/cacerts/d777342d.0
index 667cac3..667cac3 100644
--- a/security/src/main/files/cacerts/d777342d.0
+++ b/luni/src/main/files/cacerts/d777342d.0
diff --git a/security/src/main/files/cacerts/d8274e24.0 b/luni/src/main/files/cacerts/d8274e24.0
index ad94cba..ad94cba 100644
--- a/security/src/main/files/cacerts/d8274e24.0
+++ b/luni/src/main/files/cacerts/d8274e24.0
diff --git a/security/src/main/files/cacerts/ddc328ff.0 b/luni/src/main/files/cacerts/ddc328ff.0
index 44d1bf6..44d1bf6 100644
--- a/security/src/main/files/cacerts/ddc328ff.0
+++ b/luni/src/main/files/cacerts/ddc328ff.0
diff --git a/security/src/main/files/cacerts/e60bf0c0.0 b/luni/src/main/files/cacerts/e60bf0c0.0
index e999319..e999319 100644
--- a/security/src/main/files/cacerts/e60bf0c0.0
+++ b/luni/src/main/files/cacerts/e60bf0c0.0
diff --git a/security/src/main/files/cacerts/e7b8d656.0 b/luni/src/main/files/cacerts/e7b8d656.0
index ad22897..ad22897 100644
--- a/security/src/main/files/cacerts/e7b8d656.0
+++ b/luni/src/main/files/cacerts/e7b8d656.0
diff --git a/security/src/main/files/cacerts/ed524cf5.0 b/luni/src/main/files/cacerts/ed524cf5.0
index 8dc3661..8dc3661 100644
--- a/security/src/main/files/cacerts/ed524cf5.0
+++ b/luni/src/main/files/cacerts/ed524cf5.0
diff --git a/security/src/main/files/cacerts/ee7cd6fb.0 b/luni/src/main/files/cacerts/ee7cd6fb.0
index 8fdba37..8fdba37 100644
--- a/security/src/main/files/cacerts/ee7cd6fb.0
+++ b/luni/src/main/files/cacerts/ee7cd6fb.0
diff --git a/security/src/main/files/cacerts/f4996e82.0 b/luni/src/main/files/cacerts/f4996e82.0
index a7c89d1..a7c89d1 100644
--- a/security/src/main/files/cacerts/f4996e82.0
+++ b/luni/src/main/files/cacerts/f4996e82.0
diff --git a/security/src/main/files/cacerts/facacbc6.0 b/luni/src/main/files/cacerts/facacbc6.0
index 56f12b4..56f12b4 100644
--- a/security/src/main/files/cacerts/facacbc6.0
+++ b/luni/src/main/files/cacerts/facacbc6.0
diff --git a/security/src/main/files/cacerts/ff783690.0 b/luni/src/main/files/cacerts/ff783690.0
index 2c11e52..2c11e52 100644
--- a/security/src/main/files/cacerts/ff783690.0
+++ b/luni/src/main/files/cacerts/ff783690.0
diff --git a/security/src/main/files/certimport.sh b/luni/src/main/files/certimport.sh
index f65aff9..f65aff9 100755
--- a/security/src/main/files/certimport.sh
+++ b/luni/src/main/files/certimport.sh
diff --git a/annotation/src/main/java/java/lang/annotation/Annotation.java b/luni/src/main/java/java/lang/annotation/Annotation.java
index 00707b1..00707b1 100644
--- a/annotation/src/main/java/java/lang/annotation/Annotation.java
+++ b/luni/src/main/java/java/lang/annotation/Annotation.java
diff --git a/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java b/luni/src/main/java/java/lang/annotation/AnnotationFormatError.java
index 67775c7..67775c7 100644
--- a/annotation/src/main/java/java/lang/annotation/AnnotationFormatError.java
+++ b/luni/src/main/java/java/lang/annotation/AnnotationFormatError.java
diff --git a/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java b/luni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
index 75f1bed..75f1bed 100644
--- a/annotation/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
+++ b/luni/src/main/java/java/lang/annotation/AnnotationTypeMismatchException.java
diff --git a/annotation/src/main/java/java/lang/annotation/Documented.java b/luni/src/main/java/java/lang/annotation/Documented.java
index 7e7f72f..7e7f72f 100644
--- a/annotation/src/main/java/java/lang/annotation/Documented.java
+++ b/luni/src/main/java/java/lang/annotation/Documented.java
diff --git a/annotation/src/main/java/java/lang/annotation/ElementType.java b/luni/src/main/java/java/lang/annotation/ElementType.java
index f0f52aa..f0f52aa 100644
--- a/annotation/src/main/java/java/lang/annotation/ElementType.java
+++ b/luni/src/main/java/java/lang/annotation/ElementType.java
diff --git a/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java b/luni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
index 9b7aa6a..9b7aa6a 100644
--- a/annotation/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
+++ b/luni/src/main/java/java/lang/annotation/IncompleteAnnotationException.java
diff --git a/annotation/src/main/java/java/lang/annotation/Inherited.java b/luni/src/main/java/java/lang/annotation/Inherited.java
index 730d30a..730d30a 100644
--- a/annotation/src/main/java/java/lang/annotation/Inherited.java
+++ b/luni/src/main/java/java/lang/annotation/Inherited.java
diff --git a/annotation/src/main/java/java/lang/annotation/Retention.java b/luni/src/main/java/java/lang/annotation/Retention.java
index 275739e..275739e 100644
--- a/annotation/src/main/java/java/lang/annotation/Retention.java
+++ b/luni/src/main/java/java/lang/annotation/Retention.java
diff --git a/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java b/luni/src/main/java/java/lang/annotation/RetentionPolicy.java
index 70de3b0..70de3b0 100644
--- a/annotation/src/main/java/java/lang/annotation/RetentionPolicy.java
+++ b/luni/src/main/java/java/lang/annotation/RetentionPolicy.java
diff --git a/annotation/src/main/java/java/lang/annotation/Target.java b/luni/src/main/java/java/lang/annotation/Target.java
index 4ba0938..4ba0938 100644
--- a/annotation/src/main/java/java/lang/annotation/Target.java
+++ b/luni/src/main/java/java/lang/annotation/Target.java
diff --git a/annotation/src/main/java/java/lang/annotation/package.html b/luni/src/main/java/java/lang/annotation/package.html
index 5a150b3..5a150b3 100644
--- a/annotation/src/main/java/java/lang/annotation/package.html
+++ b/luni/src/main/java/java/lang/annotation/package.html
diff --git a/math/src/main/java/java/math/BigDecimal.java b/luni/src/main/java/java/math/BigDecimal.java
index 364470a..364470a 100644
--- a/math/src/main/java/java/math/BigDecimal.java
+++ b/luni/src/main/java/java/math/BigDecimal.java
diff --git a/math/src/main/java/java/math/BigInt.java b/luni/src/main/java/java/math/BigInt.java
index d7e9e73..d7e9e73 100644
--- a/math/src/main/java/java/math/BigInt.java
+++ b/luni/src/main/java/java/math/BigInt.java
diff --git a/math/src/main/java/java/math/BigInteger.java b/luni/src/main/java/java/math/BigInteger.java
index adef534..adef534 100644
--- a/math/src/main/java/java/math/BigInteger.java
+++ b/luni/src/main/java/java/math/BigInteger.java
diff --git a/math/src/main/java/java/math/BitLevel.java b/luni/src/main/java/java/math/BitLevel.java
index 22a486c..22a486c 100644
--- a/math/src/main/java/java/math/BitLevel.java
+++ b/luni/src/main/java/java/math/BitLevel.java
diff --git a/math/src/main/java/java/math/Conversion.java b/luni/src/main/java/java/math/Conversion.java
index a02edb5..a02edb5 100644
--- a/math/src/main/java/java/math/Conversion.java
+++ b/luni/src/main/java/java/math/Conversion.java
diff --git a/math/src/main/java/java/math/Division.java b/luni/src/main/java/java/math/Division.java
index e93da7e..e93da7e 100644
--- a/math/src/main/java/java/math/Division.java
+++ b/luni/src/main/java/java/math/Division.java
diff --git a/math/src/main/java/java/math/Logical.java b/luni/src/main/java/java/math/Logical.java
index 677f7f0..677f7f0 100644
--- a/math/src/main/java/java/math/Logical.java
+++ b/luni/src/main/java/java/math/Logical.java
diff --git a/math/src/main/java/java/math/MathContext.java b/luni/src/main/java/java/math/MathContext.java
index ba33a88..ba33a88 100644
--- a/math/src/main/java/java/math/MathContext.java
+++ b/luni/src/main/java/java/math/MathContext.java
diff --git a/math/src/main/java/java/math/Multiplication.java b/luni/src/main/java/java/math/Multiplication.java
index 25fd31c..25fd31c 100644
--- a/math/src/main/java/java/math/Multiplication.java
+++ b/luni/src/main/java/java/math/Multiplication.java
diff --git a/math/src/main/java/java/math/Primality.java b/luni/src/main/java/java/math/Primality.java
index 48557a6..48557a6 100644
--- a/math/src/main/java/java/math/Primality.java
+++ b/luni/src/main/java/java/math/Primality.java
diff --git a/math/src/main/java/java/math/RoundingMode.java b/luni/src/main/java/java/math/RoundingMode.java
index f4c181e..f4c181e 100644
--- a/math/src/main/java/java/math/RoundingMode.java
+++ b/luni/src/main/java/java/math/RoundingMode.java
diff --git a/math/src/main/java/java/math/package.html b/luni/src/main/java/java/math/package.html
index 4c9ba9f..4c9ba9f 100644
--- a/math/src/main/java/java/math/package.html
+++ b/luni/src/main/java/java/math/package.html
diff --git a/nio_char/src/main/java/java/nio/charset/CharacterCodingException.java b/luni/src/main/java/java/nio/charset/CharacterCodingException.java
index eee01f7..eee01f7 100644
--- a/nio_char/src/main/java/java/nio/charset/CharacterCodingException.java
+++ b/luni/src/main/java/java/nio/charset/CharacterCodingException.java
diff --git a/nio_char/src/main/java/java/nio/charset/Charset.java b/luni/src/main/java/java/nio/charset/Charset.java
index 7135d00..7135d00 100644
--- a/nio_char/src/main/java/java/nio/charset/Charset.java
+++ b/luni/src/main/java/java/nio/charset/Charset.java
diff --git a/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java b/luni/src/main/java/java/nio/charset/CharsetDecoder.java
index 393cad5..393cad5 100644
--- a/nio_char/src/main/java/java/nio/charset/CharsetDecoder.java
+++ b/luni/src/main/java/java/nio/charset/CharsetDecoder.java
diff --git a/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java b/luni/src/main/java/java/nio/charset/CharsetEncoder.java
index daf2c08..daf2c08 100644
--- a/nio_char/src/main/java/java/nio/charset/CharsetEncoder.java
+++ b/luni/src/main/java/java/nio/charset/CharsetEncoder.java
diff --git a/nio_char/src/main/java/java/nio/charset/CoderMalfunctionError.java b/luni/src/main/java/java/nio/charset/CoderMalfunctionError.java
index b7262a1..b7262a1 100644
--- a/nio_char/src/main/java/java/nio/charset/CoderMalfunctionError.java
+++ b/luni/src/main/java/java/nio/charset/CoderMalfunctionError.java
diff --git a/nio_char/src/main/java/java/nio/charset/CoderResult.java b/luni/src/main/java/java/nio/charset/CoderResult.java
index 880d9fb..880d9fb 100644
--- a/nio_char/src/main/java/java/nio/charset/CoderResult.java
+++ b/luni/src/main/java/java/nio/charset/CoderResult.java
diff --git a/nio_char/src/main/java/java/nio/charset/CodingErrorAction.java b/luni/src/main/java/java/nio/charset/CodingErrorAction.java
index 030623b..030623b 100644
--- a/nio_char/src/main/java/java/nio/charset/CodingErrorAction.java
+++ b/luni/src/main/java/java/nio/charset/CodingErrorAction.java
diff --git a/nio_char/src/main/java/java/nio/charset/IllegalCharsetNameException.java b/luni/src/main/java/java/nio/charset/IllegalCharsetNameException.java
index d1c71ea..d1c71ea 100644
--- a/nio_char/src/main/java/java/nio/charset/IllegalCharsetNameException.java
+++ b/luni/src/main/java/java/nio/charset/IllegalCharsetNameException.java
diff --git a/nio_char/src/main/java/java/nio/charset/MalformedInputException.java b/luni/src/main/java/java/nio/charset/MalformedInputException.java
index aa853bf..aa853bf 100644
--- a/nio_char/src/main/java/java/nio/charset/MalformedInputException.java
+++ b/luni/src/main/java/java/nio/charset/MalformedInputException.java
diff --git a/nio_char/src/main/java/java/nio/charset/UnmappableCharacterException.java b/luni/src/main/java/java/nio/charset/UnmappableCharacterException.java
index b929023..b929023 100644
--- a/nio_char/src/main/java/java/nio/charset/UnmappableCharacterException.java
+++ b/luni/src/main/java/java/nio/charset/UnmappableCharacterException.java
diff --git a/nio_char/src/main/java/java/nio/charset/UnsupportedCharsetException.java b/luni/src/main/java/java/nio/charset/UnsupportedCharsetException.java
index 9bfdcfe..9bfdcfe 100644
--- a/nio_char/src/main/java/java/nio/charset/UnsupportedCharsetException.java
+++ b/luni/src/main/java/java/nio/charset/UnsupportedCharsetException.java
diff --git a/nio_char/src/main/java/java/nio/charset/package.html b/luni/src/main/java/java/nio/charset/package.html
index 6554010..6554010 100644
--- a/nio_char/src/main/java/java/nio/charset/package.html
+++ b/luni/src/main/java/java/nio/charset/package.html
diff --git a/nio_char/src/main/java/java/nio/charset/spi/CharsetProvider.java b/luni/src/main/java/java/nio/charset/spi/CharsetProvider.java
index 246da6a..246da6a 100644
--- a/nio_char/src/main/java/java/nio/charset/spi/CharsetProvider.java
+++ b/luni/src/main/java/java/nio/charset/spi/CharsetProvider.java
diff --git a/nio_char/src/main/java/java/nio/charset/spi/package.html b/luni/src/main/java/java/nio/charset/spi/package.html
index 4e58391..4e58391 100644
--- a/nio_char/src/main/java/java/nio/charset/spi/package.html
+++ b/luni/src/main/java/java/nio/charset/spi/package.html
diff --git a/security/src/main/java/java/security/AccessControlException.java b/luni/src/main/java/java/security/AccessControlException.java
index ae23ab1..ae23ab1 100644
--- a/security/src/main/java/java/security/AccessControlException.java
+++ b/luni/src/main/java/java/security/AccessControlException.java
diff --git a/security/src/main/java/java/security/AlgorithmParameterGenerator.java b/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
index 6814813..6814813 100644
--- a/security/src/main/java/java/security/AlgorithmParameterGenerator.java
+++ b/luni/src/main/java/java/security/AlgorithmParameterGenerator.java
diff --git a/security/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java b/luni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
index 44b3def..44b3def 100644
--- a/security/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
+++ b/luni/src/main/java/java/security/AlgorithmParameterGeneratorSpi.java
diff --git a/security/src/main/java/java/security/AlgorithmParameters.java b/luni/src/main/java/java/security/AlgorithmParameters.java
index d659200..d659200 100644
--- a/security/src/main/java/java/security/AlgorithmParameters.java
+++ b/luni/src/main/java/java/security/AlgorithmParameters.java
diff --git a/security/src/main/java/java/security/AlgorithmParametersSpi.java b/luni/src/main/java/java/security/AlgorithmParametersSpi.java
index 41b30bc..41b30bc 100644
--- a/security/src/main/java/java/security/AlgorithmParametersSpi.java
+++ b/luni/src/main/java/java/security/AlgorithmParametersSpi.java
diff --git a/security/src/main/java/java/security/AllPermission.java b/luni/src/main/java/java/security/AllPermission.java
index c12bb27..c12bb27 100644
--- a/security/src/main/java/java/security/AllPermission.java
+++ b/luni/src/main/java/java/security/AllPermission.java
diff --git a/security/src/main/java/java/security/AllPermissionCollection.java b/luni/src/main/java/java/security/AllPermissionCollection.java
index 5b28420..5b28420 100644
--- a/security/src/main/java/java/security/AllPermissionCollection.java
+++ b/luni/src/main/java/java/security/AllPermissionCollection.java
diff --git a/security/src/main/java/java/security/AuthProvider.java b/luni/src/main/java/java/security/AuthProvider.java
index 15324b3..15324b3 100644
--- a/security/src/main/java/java/security/AuthProvider.java
+++ b/luni/src/main/java/java/security/AuthProvider.java
diff --git a/security/src/main/java/java/security/BasicPermission.java b/luni/src/main/java/java/security/BasicPermission.java
index aa49cba..aa49cba 100644
--- a/security/src/main/java/java/security/BasicPermission.java
+++ b/luni/src/main/java/java/security/BasicPermission.java
diff --git a/security/src/main/java/java/security/BasicPermissionCollection.java b/luni/src/main/java/java/security/BasicPermissionCollection.java
index 820ae7f..820ae7f 100644
--- a/security/src/main/java/java/security/BasicPermissionCollection.java
+++ b/luni/src/main/java/java/security/BasicPermissionCollection.java
diff --git a/security/src/main/java/java/security/Certificate.java b/luni/src/main/java/java/security/Certificate.java
index b30352d..b30352d 100644
--- a/security/src/main/java/java/security/Certificate.java
+++ b/luni/src/main/java/java/security/Certificate.java
diff --git a/security/src/main/java/java/security/CodeSigner.java b/luni/src/main/java/java/security/CodeSigner.java
index 24d2b55..24d2b55 100644
--- a/security/src/main/java/java/security/CodeSigner.java
+++ b/luni/src/main/java/java/security/CodeSigner.java
diff --git a/security/src/main/java/java/security/CodeSource.java b/luni/src/main/java/java/security/CodeSource.java
index 96a4b8c5..96a4b8c5 100644
--- a/security/src/main/java/java/security/CodeSource.java
+++ b/luni/src/main/java/java/security/CodeSource.java
diff --git a/security/src/main/java/java/security/DigestException.java b/luni/src/main/java/java/security/DigestException.java
index 0d0a1ee..0d0a1ee 100644
--- a/security/src/main/java/java/security/DigestException.java
+++ b/luni/src/main/java/java/security/DigestException.java
diff --git a/security/src/main/java/java/security/DigestInputStream.java b/luni/src/main/java/java/security/DigestInputStream.java
index 26433fa..26433fa 100644
--- a/security/src/main/java/java/security/DigestInputStream.java
+++ b/luni/src/main/java/java/security/DigestInputStream.java
diff --git a/security/src/main/java/java/security/DigestOutputStream.java b/luni/src/main/java/java/security/DigestOutputStream.java
index f4cd659..f4cd659 100644
--- a/security/src/main/java/java/security/DigestOutputStream.java
+++ b/luni/src/main/java/java/security/DigestOutputStream.java
diff --git a/security/src/main/java/java/security/DomainCombiner.java b/luni/src/main/java/java/security/DomainCombiner.java
index 36433b3..36433b3 100644
--- a/security/src/main/java/java/security/DomainCombiner.java
+++ b/luni/src/main/java/java/security/DomainCombiner.java
diff --git a/security/src/main/java/java/security/GeneralSecurityException.java b/luni/src/main/java/java/security/GeneralSecurityException.java
index 78fca29..78fca29 100644
--- a/security/src/main/java/java/security/GeneralSecurityException.java
+++ b/luni/src/main/java/java/security/GeneralSecurityException.java
diff --git a/security/src/main/java/java/security/Guard.java b/luni/src/main/java/java/security/Guard.java
index b652054..b652054 100644
--- a/security/src/main/java/java/security/Guard.java
+++ b/luni/src/main/java/java/security/Guard.java
diff --git a/security/src/main/java/java/security/GuardedObject.java b/luni/src/main/java/java/security/GuardedObject.java
index 34a5113..34a5113 100644
--- a/security/src/main/java/java/security/GuardedObject.java
+++ b/luni/src/main/java/java/security/GuardedObject.java
diff --git a/security/src/main/java/java/security/Identity.java b/luni/src/main/java/java/security/Identity.java
index d55cd3a..d55cd3a 100644
--- a/security/src/main/java/java/security/Identity.java
+++ b/luni/src/main/java/java/security/Identity.java
diff --git a/security/src/main/java/java/security/IdentityScope.java b/luni/src/main/java/java/security/IdentityScope.java
index 60ab3e8..60ab3e8 100644
--- a/security/src/main/java/java/security/IdentityScope.java
+++ b/luni/src/main/java/java/security/IdentityScope.java
diff --git a/security/src/main/java/java/security/InvalidAlgorithmParameterException.java b/luni/src/main/java/java/security/InvalidAlgorithmParameterException.java
index 26d9f97..26d9f97 100644
--- a/security/src/main/java/java/security/InvalidAlgorithmParameterException.java
+++ b/luni/src/main/java/java/security/InvalidAlgorithmParameterException.java
diff --git a/security/src/main/java/java/security/InvalidKeyException.java b/luni/src/main/java/java/security/InvalidKeyException.java
index f08fc51..f08fc51 100644
--- a/security/src/main/java/java/security/InvalidKeyException.java
+++ b/luni/src/main/java/java/security/InvalidKeyException.java
diff --git a/security/src/main/java/java/security/InvalidParameterException.java b/luni/src/main/java/java/security/InvalidParameterException.java
index 6ad4645..6ad4645 100644
--- a/security/src/main/java/java/security/InvalidParameterException.java
+++ b/luni/src/main/java/java/security/InvalidParameterException.java
diff --git a/security/src/main/java/java/security/Key.java b/luni/src/main/java/java/security/Key.java
index 28d24ff..28d24ff 100644
--- a/security/src/main/java/java/security/Key.java
+++ b/luni/src/main/java/java/security/Key.java
diff --git a/security/src/main/java/java/security/KeyException.java b/luni/src/main/java/java/security/KeyException.java
index 721c896..721c896 100644
--- a/security/src/main/java/java/security/KeyException.java
+++ b/luni/src/main/java/java/security/KeyException.java
diff --git a/security/src/main/java/java/security/KeyFactory.java b/luni/src/main/java/java/security/KeyFactory.java
index 7484a31..7484a31 100644
--- a/security/src/main/java/java/security/KeyFactory.java
+++ b/luni/src/main/java/java/security/KeyFactory.java
diff --git a/security/src/main/java/java/security/KeyFactorySpi.java b/luni/src/main/java/java/security/KeyFactorySpi.java
index 0de00b2..0de00b2 100644
--- a/security/src/main/java/java/security/KeyFactorySpi.java
+++ b/luni/src/main/java/java/security/KeyFactorySpi.java
diff --git a/security/src/main/java/java/security/KeyManagementException.java b/luni/src/main/java/java/security/KeyManagementException.java
index 00a5b3c..00a5b3c 100644
--- a/security/src/main/java/java/security/KeyManagementException.java
+++ b/luni/src/main/java/java/security/KeyManagementException.java
diff --git a/security/src/main/java/java/security/KeyPair.java b/luni/src/main/java/java/security/KeyPair.java
index b86593b..b86593b 100644
--- a/security/src/main/java/java/security/KeyPair.java
+++ b/luni/src/main/java/java/security/KeyPair.java
diff --git a/security/src/main/java/java/security/KeyPairGenerator.java b/luni/src/main/java/java/security/KeyPairGenerator.java
index 2a17e98..2a17e98 100644
--- a/security/src/main/java/java/security/KeyPairGenerator.java
+++ b/luni/src/main/java/java/security/KeyPairGenerator.java
diff --git a/security/src/main/java/java/security/KeyPairGeneratorSpi.java b/luni/src/main/java/java/security/KeyPairGeneratorSpi.java
index e2e22c1..e2e22c1 100644
--- a/security/src/main/java/java/security/KeyPairGeneratorSpi.java
+++ b/luni/src/main/java/java/security/KeyPairGeneratorSpi.java
diff --git a/security/src/main/java/java/security/KeyRep.java b/luni/src/main/java/java/security/KeyRep.java
index 29ccd22..29ccd22 100644
--- a/security/src/main/java/java/security/KeyRep.java
+++ b/luni/src/main/java/java/security/KeyRep.java
diff --git a/security/src/main/java/java/security/KeyStore.java b/luni/src/main/java/java/security/KeyStore.java
index 02ac01d..02ac01d 100644
--- a/security/src/main/java/java/security/KeyStore.java
+++ b/luni/src/main/java/java/security/KeyStore.java
diff --git a/security/src/main/java/java/security/KeyStoreException.java b/luni/src/main/java/java/security/KeyStoreException.java
index 4327f7f..4327f7f 100644
--- a/security/src/main/java/java/security/KeyStoreException.java
+++ b/luni/src/main/java/java/security/KeyStoreException.java
diff --git a/security/src/main/java/java/security/KeyStoreSpi.java b/luni/src/main/java/java/security/KeyStoreSpi.java
index e884123..e884123 100644
--- a/security/src/main/java/java/security/KeyStoreSpi.java
+++ b/luni/src/main/java/java/security/KeyStoreSpi.java
diff --git a/security/src/main/java/java/security/MessageDigest.java b/luni/src/main/java/java/security/MessageDigest.java
index 6996054..6996054 100644
--- a/security/src/main/java/java/security/MessageDigest.java
+++ b/luni/src/main/java/java/security/MessageDigest.java
diff --git a/security/src/main/java/java/security/MessageDigestSpi.java b/luni/src/main/java/java/security/MessageDigestSpi.java
index 52ad3cd..52ad3cd 100644
--- a/security/src/main/java/java/security/MessageDigestSpi.java
+++ b/luni/src/main/java/java/security/MessageDigestSpi.java
diff --git a/security/src/main/java/java/security/NoSuchAlgorithmException.java b/luni/src/main/java/java/security/NoSuchAlgorithmException.java
index 8ef2e3f..8ef2e3f 100644
--- a/security/src/main/java/java/security/NoSuchAlgorithmException.java
+++ b/luni/src/main/java/java/security/NoSuchAlgorithmException.java
diff --git a/security/src/main/java/java/security/NoSuchProviderException.java b/luni/src/main/java/java/security/NoSuchProviderException.java
index 57cda40..57cda40 100644
--- a/security/src/main/java/java/security/NoSuchProviderException.java
+++ b/luni/src/main/java/java/security/NoSuchProviderException.java
diff --git a/security/src/main/java/java/security/Permission.java b/luni/src/main/java/java/security/Permission.java
index 26bdfcd..26bdfcd 100644
--- a/security/src/main/java/java/security/Permission.java
+++ b/luni/src/main/java/java/security/Permission.java
diff --git a/security/src/main/java/java/security/PermissionCollection.java b/luni/src/main/java/java/security/PermissionCollection.java
index 56b6cd0..56b6cd0 100644
--- a/security/src/main/java/java/security/PermissionCollection.java
+++ b/luni/src/main/java/java/security/PermissionCollection.java
diff --git a/security/src/main/java/java/security/Permissions.java b/luni/src/main/java/java/security/Permissions.java
index e8d3375..e8d3375 100644
--- a/security/src/main/java/java/security/Permissions.java
+++ b/luni/src/main/java/java/security/Permissions.java
diff --git a/security/src/main/java/java/security/PermissionsHash.java b/luni/src/main/java/java/security/PermissionsHash.java
index 4c9e0c9..4c9e0c9 100644
--- a/security/src/main/java/java/security/PermissionsHash.java
+++ b/luni/src/main/java/java/security/PermissionsHash.java
diff --git a/security/src/main/java/java/security/Policy.java b/luni/src/main/java/java/security/Policy.java
index d5719a3..d5719a3 100644
--- a/security/src/main/java/java/security/Policy.java
+++ b/luni/src/main/java/java/security/Policy.java
diff --git a/security/src/main/java/java/security/Principal.java b/luni/src/main/java/java/security/Principal.java
index f86bc87..f86bc87 100644
--- a/security/src/main/java/java/security/Principal.java
+++ b/luni/src/main/java/java/security/Principal.java
diff --git a/security/src/main/java/java/security/PrivateKey.java b/luni/src/main/java/java/security/PrivateKey.java
index 246f286..246f286 100644
--- a/security/src/main/java/java/security/PrivateKey.java
+++ b/luni/src/main/java/java/security/PrivateKey.java
diff --git a/security/src/main/java/java/security/PrivilegedAction.java b/luni/src/main/java/java/security/PrivilegedAction.java
index 1dbbe65..1dbbe65 100644
--- a/security/src/main/java/java/security/PrivilegedAction.java
+++ b/luni/src/main/java/java/security/PrivilegedAction.java
diff --git a/security/src/main/java/java/security/PrivilegedActionException.java b/luni/src/main/java/java/security/PrivilegedActionException.java
index a1f5b15..a1f5b15 100644
--- a/security/src/main/java/java/security/PrivilegedActionException.java
+++ b/luni/src/main/java/java/security/PrivilegedActionException.java
diff --git a/security/src/main/java/java/security/PrivilegedExceptionAction.java b/luni/src/main/java/java/security/PrivilegedExceptionAction.java
index bc072d5..bc072d5 100644
--- a/security/src/main/java/java/security/PrivilegedExceptionAction.java
+++ b/luni/src/main/java/java/security/PrivilegedExceptionAction.java
diff --git a/security/src/main/java/java/security/ProtectionDomain.java b/luni/src/main/java/java/security/ProtectionDomain.java
index 1e85c4a..1e85c4a 100644
--- a/security/src/main/java/java/security/ProtectionDomain.java
+++ b/luni/src/main/java/java/security/ProtectionDomain.java
diff --git a/security/src/main/java/java/security/Provider.java b/luni/src/main/java/java/security/Provider.java
index cf9c94d..cf9c94d 100644
--- a/security/src/main/java/java/security/Provider.java
+++ b/luni/src/main/java/java/security/Provider.java
diff --git a/security/src/main/java/java/security/ProviderException.java b/luni/src/main/java/java/security/ProviderException.java
index 22950f5..22950f5 100644
--- a/security/src/main/java/java/security/ProviderException.java
+++ b/luni/src/main/java/java/security/ProviderException.java
diff --git a/security/src/main/java/java/security/PublicKey.java b/luni/src/main/java/java/security/PublicKey.java
index c197840..c197840 100644
--- a/security/src/main/java/java/security/PublicKey.java
+++ b/luni/src/main/java/java/security/PublicKey.java
diff --git a/security/src/main/java/java/security/SecureClassLoader.java b/luni/src/main/java/java/security/SecureClassLoader.java
index 07bebc9..07bebc9 100644
--- a/security/src/main/java/java/security/SecureClassLoader.java
+++ b/luni/src/main/java/java/security/SecureClassLoader.java
diff --git a/security/src/main/java/java/security/SecureRandom.java b/luni/src/main/java/java/security/SecureRandom.java
index c697504..c697504 100644
--- a/security/src/main/java/java/security/SecureRandom.java
+++ b/luni/src/main/java/java/security/SecureRandom.java
diff --git a/security/src/main/java/java/security/SecureRandomSpi.java b/luni/src/main/java/java/security/SecureRandomSpi.java
index 829464f..829464f 100644
--- a/security/src/main/java/java/security/SecureRandomSpi.java
+++ b/luni/src/main/java/java/security/SecureRandomSpi.java
diff --git a/security/src/main/java/java/security/Security.java b/luni/src/main/java/java/security/Security.java
index 1fea1bd..1fea1bd 100644
--- a/security/src/main/java/java/security/Security.java
+++ b/luni/src/main/java/java/security/Security.java
diff --git a/security/src/main/java/java/security/SecurityPermission.java b/luni/src/main/java/java/security/SecurityPermission.java
index 599ec6f..599ec6f 100644
--- a/security/src/main/java/java/security/SecurityPermission.java
+++ b/luni/src/main/java/java/security/SecurityPermission.java
diff --git a/security/src/main/java/java/security/Signature.java b/luni/src/main/java/java/security/Signature.java
index 4e3fe14..4e3fe14 100644
--- a/security/src/main/java/java/security/Signature.java
+++ b/luni/src/main/java/java/security/Signature.java
diff --git a/security/src/main/java/java/security/SignatureException.java b/luni/src/main/java/java/security/SignatureException.java
index f8909d1..f8909d1 100644
--- a/security/src/main/java/java/security/SignatureException.java
+++ b/luni/src/main/java/java/security/SignatureException.java
diff --git a/security/src/main/java/java/security/SignatureSpi.java b/luni/src/main/java/java/security/SignatureSpi.java
index 93c9e8c..93c9e8c 100644
--- a/security/src/main/java/java/security/SignatureSpi.java
+++ b/luni/src/main/java/java/security/SignatureSpi.java
diff --git a/security/src/main/java/java/security/SignedObject.java b/luni/src/main/java/java/security/SignedObject.java
index 3347cf3..3347cf3 100644
--- a/security/src/main/java/java/security/SignedObject.java
+++ b/luni/src/main/java/java/security/SignedObject.java
diff --git a/security/src/main/java/java/security/Signer.java b/luni/src/main/java/java/security/Signer.java
index 64996bf..64996bf 100644
--- a/security/src/main/java/java/security/Signer.java
+++ b/luni/src/main/java/java/security/Signer.java
diff --git a/security/src/main/java/java/security/Timestamp.java b/luni/src/main/java/java/security/Timestamp.java
index 5a2930a..5a2930a 100644
--- a/security/src/main/java/java/security/Timestamp.java
+++ b/luni/src/main/java/java/security/Timestamp.java
diff --git a/security/src/main/java/java/security/UnrecoverableEntryException.java b/luni/src/main/java/java/security/UnrecoverableEntryException.java
index 24ff54b..24ff54b 100644
--- a/security/src/main/java/java/security/UnrecoverableEntryException.java
+++ b/luni/src/main/java/java/security/UnrecoverableEntryException.java
diff --git a/security/src/main/java/java/security/UnrecoverableKeyException.java b/luni/src/main/java/java/security/UnrecoverableKeyException.java
index 3840e6b..3840e6b 100644
--- a/security/src/main/java/java/security/UnrecoverableKeyException.java
+++ b/luni/src/main/java/java/security/UnrecoverableKeyException.java
diff --git a/security/src/main/java/java/security/UnresolvedPermission.java b/luni/src/main/java/java/security/UnresolvedPermission.java
index bf99a40..bf99a40 100644
--- a/security/src/main/java/java/security/UnresolvedPermission.java
+++ b/luni/src/main/java/java/security/UnresolvedPermission.java
diff --git a/security/src/main/java/java/security/UnresolvedPermissionCollection.java b/luni/src/main/java/java/security/UnresolvedPermissionCollection.java
index 3a6ba92..3a6ba92 100644
--- a/security/src/main/java/java/security/UnresolvedPermissionCollection.java
+++ b/luni/src/main/java/java/security/UnresolvedPermissionCollection.java
diff --git a/security/src/main/java/java/security/acl/Acl.java b/luni/src/main/java/java/security/acl/Acl.java
index 88dd9f0..88dd9f0 100644
--- a/security/src/main/java/java/security/acl/Acl.java
+++ b/luni/src/main/java/java/security/acl/Acl.java
diff --git a/security/src/main/java/java/security/acl/AclEntry.java b/luni/src/main/java/java/security/acl/AclEntry.java
index fe2fb3a..fe2fb3a 100644
--- a/security/src/main/java/java/security/acl/AclEntry.java
+++ b/luni/src/main/java/java/security/acl/AclEntry.java
diff --git a/security/src/main/java/java/security/acl/AclNotFoundException.java b/luni/src/main/java/java/security/acl/AclNotFoundException.java
index 59b9045..59b9045 100644
--- a/security/src/main/java/java/security/acl/AclNotFoundException.java
+++ b/luni/src/main/java/java/security/acl/AclNotFoundException.java
diff --git a/security/src/main/java/java/security/acl/Group.java b/luni/src/main/java/java/security/acl/Group.java
index 7452181..7452181 100644
--- a/security/src/main/java/java/security/acl/Group.java
+++ b/luni/src/main/java/java/security/acl/Group.java
diff --git a/security/src/main/java/java/security/acl/LastOwnerException.java b/luni/src/main/java/java/security/acl/LastOwnerException.java
index f947f22..f947f22 100644
--- a/security/src/main/java/java/security/acl/LastOwnerException.java
+++ b/luni/src/main/java/java/security/acl/LastOwnerException.java
diff --git a/security/src/main/java/java/security/acl/NotOwnerException.java b/luni/src/main/java/java/security/acl/NotOwnerException.java
index c7de8c9..c7de8c9 100644
--- a/security/src/main/java/java/security/acl/NotOwnerException.java
+++ b/luni/src/main/java/java/security/acl/NotOwnerException.java
diff --git a/security/src/main/java/java/security/acl/Owner.java b/luni/src/main/java/java/security/acl/Owner.java
index c392e2f..c392e2f 100644
--- a/security/src/main/java/java/security/acl/Owner.java
+++ b/luni/src/main/java/java/security/acl/Owner.java
diff --git a/security/src/main/java/java/security/acl/Permission.java b/luni/src/main/java/java/security/acl/Permission.java
index f2ee251..f2ee251 100644
--- a/security/src/main/java/java/security/acl/Permission.java
+++ b/luni/src/main/java/java/security/acl/Permission.java
diff --git a/security/src/main/java/java/security/acl/package.html b/luni/src/main/java/java/security/acl/package.html
index b8ec061..b8ec061 100644
--- a/security/src/main/java/java/security/acl/package.html
+++ b/luni/src/main/java/java/security/acl/package.html
diff --git a/security/src/main/java/java/security/cert/CRL.java b/luni/src/main/java/java/security/cert/CRL.java
index 8153853..8153853 100644
--- a/security/src/main/java/java/security/cert/CRL.java
+++ b/luni/src/main/java/java/security/cert/CRL.java
diff --git a/security/src/main/java/java/security/cert/CRLException.java b/luni/src/main/java/java/security/cert/CRLException.java
index 01e2071..01e2071 100644
--- a/security/src/main/java/java/security/cert/CRLException.java
+++ b/luni/src/main/java/java/security/cert/CRLException.java
diff --git a/security/src/main/java/java/security/cert/CRLSelector.java b/luni/src/main/java/java/security/cert/CRLSelector.java
index 5b14446..5b14446 100644
--- a/security/src/main/java/java/security/cert/CRLSelector.java
+++ b/luni/src/main/java/java/security/cert/CRLSelector.java
diff --git a/security/src/main/java/java/security/cert/CertPath.java b/luni/src/main/java/java/security/cert/CertPath.java
index e9d049b..e9d049b 100644
--- a/security/src/main/java/java/security/cert/CertPath.java
+++ b/luni/src/main/java/java/security/cert/CertPath.java
diff --git a/security/src/main/java/java/security/cert/CertPathBuilder.java b/luni/src/main/java/java/security/cert/CertPathBuilder.java
index 8daa741..8daa741 100644
--- a/security/src/main/java/java/security/cert/CertPathBuilder.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilder.java
diff --git a/security/src/main/java/java/security/cert/CertPathBuilderException.java b/luni/src/main/java/java/security/cert/CertPathBuilderException.java
index 58a4a60..58a4a60 100644
--- a/security/src/main/java/java/security/cert/CertPathBuilderException.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilderException.java
diff --git a/security/src/main/java/java/security/cert/CertPathBuilderResult.java b/luni/src/main/java/java/security/cert/CertPathBuilderResult.java
index 36d99a1..36d99a1 100644
--- a/security/src/main/java/java/security/cert/CertPathBuilderResult.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilderResult.java
diff --git a/security/src/main/java/java/security/cert/CertPathBuilderSpi.java b/luni/src/main/java/java/security/cert/CertPathBuilderSpi.java
index 80ee0ef..80ee0ef 100644
--- a/security/src/main/java/java/security/cert/CertPathBuilderSpi.java
+++ b/luni/src/main/java/java/security/cert/CertPathBuilderSpi.java
diff --git a/security/src/main/java/java/security/cert/CertPathParameters.java b/luni/src/main/java/java/security/cert/CertPathParameters.java
index e2cee18..e2cee18 100644
--- a/security/src/main/java/java/security/cert/CertPathParameters.java
+++ b/luni/src/main/java/java/security/cert/CertPathParameters.java
diff --git a/security/src/main/java/java/security/cert/CertPathValidator.java b/luni/src/main/java/java/security/cert/CertPathValidator.java
index 0d73280..0d73280 100644
--- a/security/src/main/java/java/security/cert/CertPathValidator.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidator.java
diff --git a/security/src/main/java/java/security/cert/CertPathValidatorException.java b/luni/src/main/java/java/security/cert/CertPathValidatorException.java
index 4d2b69f..4d2b69f 100644
--- a/security/src/main/java/java/security/cert/CertPathValidatorException.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidatorException.java
diff --git a/security/src/main/java/java/security/cert/CertPathValidatorResult.java b/luni/src/main/java/java/security/cert/CertPathValidatorResult.java
index 7fab21a..7fab21a 100644
--- a/security/src/main/java/java/security/cert/CertPathValidatorResult.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidatorResult.java
diff --git a/security/src/main/java/java/security/cert/CertPathValidatorSpi.java b/luni/src/main/java/java/security/cert/CertPathValidatorSpi.java
index e14e8dd..e14e8dd 100644
--- a/security/src/main/java/java/security/cert/CertPathValidatorSpi.java
+++ b/luni/src/main/java/java/security/cert/CertPathValidatorSpi.java
diff --git a/security/src/main/java/java/security/cert/CertSelector.java b/luni/src/main/java/java/security/cert/CertSelector.java
index c490b22..c490b22 100644
--- a/security/src/main/java/java/security/cert/CertSelector.java
+++ b/luni/src/main/java/java/security/cert/CertSelector.java
diff --git a/security/src/main/java/java/security/cert/CertStore.java b/luni/src/main/java/java/security/cert/CertStore.java
index d0b7600..d0b7600 100644
--- a/security/src/main/java/java/security/cert/CertStore.java
+++ b/luni/src/main/java/java/security/cert/CertStore.java
diff --git a/security/src/main/java/java/security/cert/CertStoreException.java b/luni/src/main/java/java/security/cert/CertStoreException.java
index 7f356b2..7f356b2 100644
--- a/security/src/main/java/java/security/cert/CertStoreException.java
+++ b/luni/src/main/java/java/security/cert/CertStoreException.java
diff --git a/security/src/main/java/java/security/cert/CertStoreParameters.java b/luni/src/main/java/java/security/cert/CertStoreParameters.java
index 06a1976..06a1976 100644
--- a/security/src/main/java/java/security/cert/CertStoreParameters.java
+++ b/luni/src/main/java/java/security/cert/CertStoreParameters.java
diff --git a/security/src/main/java/java/security/cert/CertStoreSpi.java b/luni/src/main/java/java/security/cert/CertStoreSpi.java
index cb38a31..cb38a31 100644
--- a/security/src/main/java/java/security/cert/CertStoreSpi.java
+++ b/luni/src/main/java/java/security/cert/CertStoreSpi.java
diff --git a/security/src/main/java/java/security/cert/Certificate.java b/luni/src/main/java/java/security/cert/Certificate.java
index 22cbe9c..22cbe9c 100644
--- a/security/src/main/java/java/security/cert/Certificate.java
+++ b/luni/src/main/java/java/security/cert/Certificate.java
diff --git a/security/src/main/java/java/security/cert/CertificateEncodingException.java b/luni/src/main/java/java/security/cert/CertificateEncodingException.java
index c5532b9..c5532b9 100644
--- a/security/src/main/java/java/security/cert/CertificateEncodingException.java
+++ b/luni/src/main/java/java/security/cert/CertificateEncodingException.java
diff --git a/security/src/main/java/java/security/cert/CertificateException.java b/luni/src/main/java/java/security/cert/CertificateException.java
index 8b1c4d3..8b1c4d3 100644
--- a/security/src/main/java/java/security/cert/CertificateException.java
+++ b/luni/src/main/java/java/security/cert/CertificateException.java
diff --git a/security/src/main/java/java/security/cert/CertificateExpiredException.java b/luni/src/main/java/java/security/cert/CertificateExpiredException.java
index e15bf98..e15bf98 100644
--- a/security/src/main/java/java/security/cert/CertificateExpiredException.java
+++ b/luni/src/main/java/java/security/cert/CertificateExpiredException.java
diff --git a/security/src/main/java/java/security/cert/CertificateFactory.java b/luni/src/main/java/java/security/cert/CertificateFactory.java
index cb2636a..cb2636a 100644
--- a/security/src/main/java/java/security/cert/CertificateFactory.java
+++ b/luni/src/main/java/java/security/cert/CertificateFactory.java
diff --git a/security/src/main/java/java/security/cert/CertificateFactorySpi.java b/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
index d9f2044..d9f2044 100644
--- a/security/src/main/java/java/security/cert/CertificateFactorySpi.java
+++ b/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
diff --git a/security/src/main/java/java/security/cert/CertificateNotYetValidException.java b/luni/src/main/java/java/security/cert/CertificateNotYetValidException.java
index dd26bf8..dd26bf8 100644
--- a/security/src/main/java/java/security/cert/CertificateNotYetValidException.java
+++ b/luni/src/main/java/java/security/cert/CertificateNotYetValidException.java
diff --git a/security/src/main/java/java/security/cert/CertificateParsingException.java b/luni/src/main/java/java/security/cert/CertificateParsingException.java
index 4efd159..4efd159 100644
--- a/security/src/main/java/java/security/cert/CertificateParsingException.java
+++ b/luni/src/main/java/java/security/cert/CertificateParsingException.java
diff --git a/security/src/main/java/java/security/cert/CollectionCertStoreParameters.java b/luni/src/main/java/java/security/cert/CollectionCertStoreParameters.java
index 3c2fe1c..3c2fe1c 100644
--- a/security/src/main/java/java/security/cert/CollectionCertStoreParameters.java
+++ b/luni/src/main/java/java/security/cert/CollectionCertStoreParameters.java
diff --git a/security/src/main/java/java/security/cert/LDAPCertStoreParameters.java b/luni/src/main/java/java/security/cert/LDAPCertStoreParameters.java
index 1d6542f..1d6542f 100644
--- a/security/src/main/java/java/security/cert/LDAPCertStoreParameters.java
+++ b/luni/src/main/java/java/security/cert/LDAPCertStoreParameters.java
diff --git a/security/src/main/java/java/security/cert/PKIXBuilderParameters.java b/luni/src/main/java/java/security/cert/PKIXBuilderParameters.java
index 1a75063..1a75063 100644
--- a/security/src/main/java/java/security/cert/PKIXBuilderParameters.java
+++ b/luni/src/main/java/java/security/cert/PKIXBuilderParameters.java
diff --git a/security/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java b/luni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
index 5a9fb2d..5a9fb2d 100644
--- a/security/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
+++ b/luni/src/main/java/java/security/cert/PKIXCertPathBuilderResult.java
diff --git a/security/src/main/java/java/security/cert/PKIXCertPathChecker.java b/luni/src/main/java/java/security/cert/PKIXCertPathChecker.java
index 5eaac74..5eaac74 100644
--- a/security/src/main/java/java/security/cert/PKIXCertPathChecker.java
+++ b/luni/src/main/java/java/security/cert/PKIXCertPathChecker.java
diff --git a/security/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java b/luni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
index d82c699..d82c699 100644
--- a/security/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
+++ b/luni/src/main/java/java/security/cert/PKIXCertPathValidatorResult.java
diff --git a/security/src/main/java/java/security/cert/PKIXParameters.java b/luni/src/main/java/java/security/cert/PKIXParameters.java
index 79d3d5e..79d3d5e 100644
--- a/security/src/main/java/java/security/cert/PKIXParameters.java
+++ b/luni/src/main/java/java/security/cert/PKIXParameters.java
diff --git a/security/src/main/java/java/security/cert/PolicyNode.java b/luni/src/main/java/java/security/cert/PolicyNode.java
index c485b69..c485b69 100644
--- a/security/src/main/java/java/security/cert/PolicyNode.java
+++ b/luni/src/main/java/java/security/cert/PolicyNode.java
diff --git a/security/src/main/java/java/security/cert/PolicyQualifierInfo.java b/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
index 903a6e9..903a6e9 100644
--- a/security/src/main/java/java/security/cert/PolicyQualifierInfo.java
+++ b/luni/src/main/java/java/security/cert/PolicyQualifierInfo.java
diff --git a/security/src/main/java/java/security/cert/TrustAnchor.java b/luni/src/main/java/java/security/cert/TrustAnchor.java
index eae38d6..eae38d6 100644
--- a/security/src/main/java/java/security/cert/TrustAnchor.java
+++ b/luni/src/main/java/java/security/cert/TrustAnchor.java
diff --git a/security/src/main/java/java/security/cert/X509CRL.java b/luni/src/main/java/java/security/cert/X509CRL.java
index cb99843..cb99843 100644
--- a/security/src/main/java/java/security/cert/X509CRL.java
+++ b/luni/src/main/java/java/security/cert/X509CRL.java
diff --git a/security/src/main/java/java/security/cert/X509CRLEntry.java b/luni/src/main/java/java/security/cert/X509CRLEntry.java
index ccdaf2f..ccdaf2f 100644
--- a/security/src/main/java/java/security/cert/X509CRLEntry.java
+++ b/luni/src/main/java/java/security/cert/X509CRLEntry.java
diff --git a/security/src/main/java/java/security/cert/X509CRLSelector.java b/luni/src/main/java/java/security/cert/X509CRLSelector.java
index 0edddf4..0edddf4 100644
--- a/security/src/main/java/java/security/cert/X509CRLSelector.java
+++ b/luni/src/main/java/java/security/cert/X509CRLSelector.java
diff --git a/security/src/main/java/java/security/cert/X509CertSelector.java b/luni/src/main/java/java/security/cert/X509CertSelector.java
index 0460fd6..0460fd6 100644
--- a/security/src/main/java/java/security/cert/X509CertSelector.java
+++ b/luni/src/main/java/java/security/cert/X509CertSelector.java
diff --git a/security/src/main/java/java/security/cert/X509Certificate.java b/luni/src/main/java/java/security/cert/X509Certificate.java
index e49901c..e49901c 100644
--- a/security/src/main/java/java/security/cert/X509Certificate.java
+++ b/luni/src/main/java/java/security/cert/X509Certificate.java
diff --git a/security/src/main/java/java/security/cert/X509Extension.java b/luni/src/main/java/java/security/cert/X509Extension.java
index 1543f3d..1543f3d 100644
--- a/security/src/main/java/java/security/cert/X509Extension.java
+++ b/luni/src/main/java/java/security/cert/X509Extension.java
diff --git a/security/src/main/java/java/security/cert/package.html b/luni/src/main/java/java/security/cert/package.html
index e39b38f..e39b38f 100644
--- a/security/src/main/java/java/security/cert/package.html
+++ b/luni/src/main/java/java/security/cert/package.html
diff --git a/security/src/main/java/java/security/interfaces/DSAKey.java b/luni/src/main/java/java/security/interfaces/DSAKey.java
index ac9aade..ac9aade 100644
--- a/security/src/main/java/java/security/interfaces/DSAKey.java
+++ b/luni/src/main/java/java/security/interfaces/DSAKey.java
diff --git a/security/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java b/luni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
index b7b5480..b7b5480 100644
--- a/security/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
+++ b/luni/src/main/java/java/security/interfaces/DSAKeyPairGenerator.java
diff --git a/security/src/main/java/java/security/interfaces/DSAParams.java b/luni/src/main/java/java/security/interfaces/DSAParams.java
index 62f2d00..62f2d00 100644
--- a/security/src/main/java/java/security/interfaces/DSAParams.java
+++ b/luni/src/main/java/java/security/interfaces/DSAParams.java
diff --git a/security/src/main/java/java/security/interfaces/DSAPrivateKey.java b/luni/src/main/java/java/security/interfaces/DSAPrivateKey.java
index 6419440..6419440 100644
--- a/security/src/main/java/java/security/interfaces/DSAPrivateKey.java
+++ b/luni/src/main/java/java/security/interfaces/DSAPrivateKey.java
diff --git a/security/src/main/java/java/security/interfaces/DSAPublicKey.java b/luni/src/main/java/java/security/interfaces/DSAPublicKey.java
index 9642bf1..9642bf1 100644
--- a/security/src/main/java/java/security/interfaces/DSAPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/DSAPublicKey.java
diff --git a/security/src/main/java/java/security/interfaces/ECKey.java b/luni/src/main/java/java/security/interfaces/ECKey.java
index 5469392..5469392 100644
--- a/security/src/main/java/java/security/interfaces/ECKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECKey.java
diff --git a/security/src/main/java/java/security/interfaces/ECPrivateKey.java b/luni/src/main/java/java/security/interfaces/ECPrivateKey.java
index 254d2a6..254d2a6 100644
--- a/security/src/main/java/java/security/interfaces/ECPrivateKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECPrivateKey.java
diff --git a/security/src/main/java/java/security/interfaces/ECPublicKey.java b/luni/src/main/java/java/security/interfaces/ECPublicKey.java
index 8ad97fc..8ad97fc 100644
--- a/security/src/main/java/java/security/interfaces/ECPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/ECPublicKey.java
diff --git a/security/src/main/java/java/security/interfaces/RSAKey.java b/luni/src/main/java/java/security/interfaces/RSAKey.java
index 2c9e6c1..2c9e6c1 100644
--- a/security/src/main/java/java/security/interfaces/RSAKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAKey.java
diff --git a/security/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java b/luni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
index d8aa1bf..d8aa1bf 100644
--- a/security/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
diff --git a/security/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java b/luni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
index a670491..a670491 100644
--- a/security/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAPrivateCrtKey.java
diff --git a/security/src/main/java/java/security/interfaces/RSAPrivateKey.java b/luni/src/main/java/java/security/interfaces/RSAPrivateKey.java
index 0da15e9..0da15e9 100644
--- a/security/src/main/java/java/security/interfaces/RSAPrivateKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAPrivateKey.java
diff --git a/security/src/main/java/java/security/interfaces/RSAPublicKey.java b/luni/src/main/java/java/security/interfaces/RSAPublicKey.java
index 379351f..379351f 100644
--- a/security/src/main/java/java/security/interfaces/RSAPublicKey.java
+++ b/luni/src/main/java/java/security/interfaces/RSAPublicKey.java
diff --git a/security/src/main/java/java/security/interfaces/package.html b/luni/src/main/java/java/security/interfaces/package.html
index dd24196..dd24196 100644
--- a/security/src/main/java/java/security/interfaces/package.html
+++ b/luni/src/main/java/java/security/interfaces/package.html
diff --git a/security/src/main/java/java/security/package.html b/luni/src/main/java/java/security/package.html
index 4c5e2b4..4c5e2b4 100644
--- a/security/src/main/java/java/security/package.html
+++ b/luni/src/main/java/java/security/package.html
diff --git a/security/src/main/java/java/security/security.properties b/luni/src/main/java/java/security/security.properties
index cc16be7..cc16be7 100644
--- a/security/src/main/java/java/security/security.properties
+++ b/luni/src/main/java/java/security/security.properties
diff --git a/security/src/main/java/java/security/spec/AlgorithmParameterSpec.java b/luni/src/main/java/java/security/spec/AlgorithmParameterSpec.java
index 0cbba76..0cbba76 100644
--- a/security/src/main/java/java/security/spec/AlgorithmParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/AlgorithmParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/DSAParameterSpec.java b/luni/src/main/java/java/security/spec/DSAParameterSpec.java
index e23a682..e23a682 100644
--- a/security/src/main/java/java/security/spec/DSAParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/DSAParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/DSAPrivateKeySpec.java b/luni/src/main/java/java/security/spec/DSAPrivateKeySpec.java
index 6dc12c8..6dc12c8 100644
--- a/security/src/main/java/java/security/spec/DSAPrivateKeySpec.java
+++ b/luni/src/main/java/java/security/spec/DSAPrivateKeySpec.java
diff --git a/security/src/main/java/java/security/spec/DSAPublicKeySpec.java b/luni/src/main/java/java/security/spec/DSAPublicKeySpec.java
index af90919..af90919 100644
--- a/security/src/main/java/java/security/spec/DSAPublicKeySpec.java
+++ b/luni/src/main/java/java/security/spec/DSAPublicKeySpec.java
diff --git a/security/src/main/java/java/security/spec/ECField.java b/luni/src/main/java/java/security/spec/ECField.java
index b4c6be2..b4c6be2 100644
--- a/security/src/main/java/java/security/spec/ECField.java
+++ b/luni/src/main/java/java/security/spec/ECField.java
diff --git a/security/src/main/java/java/security/spec/ECFieldF2m.java b/luni/src/main/java/java/security/spec/ECFieldF2m.java
index e5a636a..e5a636a 100644
--- a/security/src/main/java/java/security/spec/ECFieldF2m.java
+++ b/luni/src/main/java/java/security/spec/ECFieldF2m.java
diff --git a/security/src/main/java/java/security/spec/ECFieldFp.java b/luni/src/main/java/java/security/spec/ECFieldFp.java
index b68238d..b68238d 100644
--- a/security/src/main/java/java/security/spec/ECFieldFp.java
+++ b/luni/src/main/java/java/security/spec/ECFieldFp.java
diff --git a/security/src/main/java/java/security/spec/ECGenParameterSpec.java b/luni/src/main/java/java/security/spec/ECGenParameterSpec.java
index de4cd04..de4cd04 100644
--- a/security/src/main/java/java/security/spec/ECGenParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/ECGenParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/ECParameterSpec.java b/luni/src/main/java/java/security/spec/ECParameterSpec.java
index a1985db..a1985db 100644
--- a/security/src/main/java/java/security/spec/ECParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/ECParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/ECPoint.java b/luni/src/main/java/java/security/spec/ECPoint.java
index 0751757..0751757 100644
--- a/security/src/main/java/java/security/spec/ECPoint.java
+++ b/luni/src/main/java/java/security/spec/ECPoint.java
diff --git a/security/src/main/java/java/security/spec/ECPrivateKeySpec.java b/luni/src/main/java/java/security/spec/ECPrivateKeySpec.java
index 1ddfec3..1ddfec3 100644
--- a/security/src/main/java/java/security/spec/ECPrivateKeySpec.java
+++ b/luni/src/main/java/java/security/spec/ECPrivateKeySpec.java
diff --git a/security/src/main/java/java/security/spec/ECPublicKeySpec.java b/luni/src/main/java/java/security/spec/ECPublicKeySpec.java
index 0c88590..0c88590 100644
--- a/security/src/main/java/java/security/spec/ECPublicKeySpec.java
+++ b/luni/src/main/java/java/security/spec/ECPublicKeySpec.java
diff --git a/security/src/main/java/java/security/spec/EllipticCurve.java b/luni/src/main/java/java/security/spec/EllipticCurve.java
index 45ff042..45ff042 100644
--- a/security/src/main/java/java/security/spec/EllipticCurve.java
+++ b/luni/src/main/java/java/security/spec/EllipticCurve.java
diff --git a/security/src/main/java/java/security/spec/EncodedKeySpec.java b/luni/src/main/java/java/security/spec/EncodedKeySpec.java
index d34794c..d34794c 100644
--- a/security/src/main/java/java/security/spec/EncodedKeySpec.java
+++ b/luni/src/main/java/java/security/spec/EncodedKeySpec.java
diff --git a/security/src/main/java/java/security/spec/InvalidKeySpecException.java b/luni/src/main/java/java/security/spec/InvalidKeySpecException.java
index 4ae5877..4ae5877 100644
--- a/security/src/main/java/java/security/spec/InvalidKeySpecException.java
+++ b/luni/src/main/java/java/security/spec/InvalidKeySpecException.java
diff --git a/security/src/main/java/java/security/spec/InvalidParameterSpecException.java b/luni/src/main/java/java/security/spec/InvalidParameterSpecException.java
index e308dd8..e308dd8 100644
--- a/security/src/main/java/java/security/spec/InvalidParameterSpecException.java
+++ b/luni/src/main/java/java/security/spec/InvalidParameterSpecException.java
diff --git a/security/src/main/java/java/security/spec/KeySpec.java b/luni/src/main/java/java/security/spec/KeySpec.java
index fe8df1d..fe8df1d 100644
--- a/security/src/main/java/java/security/spec/KeySpec.java
+++ b/luni/src/main/java/java/security/spec/KeySpec.java
diff --git a/security/src/main/java/java/security/spec/MGF1ParameterSpec.java b/luni/src/main/java/java/security/spec/MGF1ParameterSpec.java
index 6475d90..6475d90 100644
--- a/security/src/main/java/java/security/spec/MGF1ParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/MGF1ParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java b/luni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
index 6910789..6910789 100644
--- a/security/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
+++ b/luni/src/main/java/java/security/spec/PKCS8EncodedKeySpec.java
diff --git a/security/src/main/java/java/security/spec/PSSParameterSpec.java b/luni/src/main/java/java/security/spec/PSSParameterSpec.java
index 06c1d05..06c1d05 100644
--- a/security/src/main/java/java/security/spec/PSSParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/PSSParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java b/luni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
index 2377c75..2377c75 100644
--- a/security/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
+++ b/luni/src/main/java/java/security/spec/RSAKeyGenParameterSpec.java
diff --git a/security/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java b/luni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
index 28469d7..28469d7 100644
--- a/security/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
diff --git a/security/src/main/java/java/security/spec/RSAOtherPrimeInfo.java b/luni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
index 177ddf5..177ddf5 100644
--- a/security/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
+++ b/luni/src/main/java/java/security/spec/RSAOtherPrimeInfo.java
diff --git a/security/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java b/luni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
index e786e9e..e786e9e 100644
--- a/security/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAPrivateCrtKeySpec.java
diff --git a/security/src/main/java/java/security/spec/RSAPrivateKeySpec.java b/luni/src/main/java/java/security/spec/RSAPrivateKeySpec.java
index c94420e..c94420e 100644
--- a/security/src/main/java/java/security/spec/RSAPrivateKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAPrivateKeySpec.java
diff --git a/security/src/main/java/java/security/spec/RSAPublicKeySpec.java b/luni/src/main/java/java/security/spec/RSAPublicKeySpec.java
index fe6de07..fe6de07 100644
--- a/security/src/main/java/java/security/spec/RSAPublicKeySpec.java
+++ b/luni/src/main/java/java/security/spec/RSAPublicKeySpec.java
diff --git a/security/src/main/java/java/security/spec/X509EncodedKeySpec.java b/luni/src/main/java/java/security/spec/X509EncodedKeySpec.java
index 61f3475..61f3475 100644
--- a/security/src/main/java/java/security/spec/X509EncodedKeySpec.java
+++ b/luni/src/main/java/java/security/spec/X509EncodedKeySpec.java
diff --git a/security/src/main/java/java/security/spec/package.html b/luni/src/main/java/java/security/spec/package.html
index d75aee6..d75aee6 100644
--- a/security/src/main/java/java/security/spec/package.html
+++ b/luni/src/main/java/java/security/spec/package.html
diff --git a/sql/src/main/java/java/sql/Array.java b/luni/src/main/java/java/sql/Array.java
index fc9debe..fc9debe 100644
--- a/sql/src/main/java/java/sql/Array.java
+++ b/luni/src/main/java/java/sql/Array.java
diff --git a/sql/src/main/java/java/sql/BatchUpdateException.java b/luni/src/main/java/java/sql/BatchUpdateException.java
index 0a616db..0a616db 100644
--- a/sql/src/main/java/java/sql/BatchUpdateException.java
+++ b/luni/src/main/java/java/sql/BatchUpdateException.java
diff --git a/sql/src/main/java/java/sql/Blob.java b/luni/src/main/java/java/sql/Blob.java
index 0074b98..0074b98 100644
--- a/sql/src/main/java/java/sql/Blob.java
+++ b/luni/src/main/java/java/sql/Blob.java
diff --git a/sql/src/main/java/java/sql/CallableStatement.java b/luni/src/main/java/java/sql/CallableStatement.java
index be5463b..be5463b 100644
--- a/sql/src/main/java/java/sql/CallableStatement.java
+++ b/luni/src/main/java/java/sql/CallableStatement.java
diff --git a/sql/src/main/java/java/sql/Clob.java b/luni/src/main/java/java/sql/Clob.java
index 73fe7fb..73fe7fb 100644
--- a/sql/src/main/java/java/sql/Clob.java
+++ b/luni/src/main/java/java/sql/Clob.java
diff --git a/sql/src/main/java/java/sql/Connection.java b/luni/src/main/java/java/sql/Connection.java
index 0704cca..0704cca 100644
--- a/sql/src/main/java/java/sql/Connection.java
+++ b/luni/src/main/java/java/sql/Connection.java
diff --git a/sql/src/main/java/java/sql/DataTruncation.java b/luni/src/main/java/java/sql/DataTruncation.java
index 20da727..20da727 100644
--- a/sql/src/main/java/java/sql/DataTruncation.java
+++ b/luni/src/main/java/java/sql/DataTruncation.java
diff --git a/sql/src/main/java/java/sql/DatabaseMetaData.java b/luni/src/main/java/java/sql/DatabaseMetaData.java
index aca03c0..aca03c0 100644
--- a/sql/src/main/java/java/sql/DatabaseMetaData.java
+++ b/luni/src/main/java/java/sql/DatabaseMetaData.java
diff --git a/sql/src/main/java/java/sql/Date.java b/luni/src/main/java/java/sql/Date.java
index 90b5246..90b5246 100644
--- a/sql/src/main/java/java/sql/Date.java
+++ b/luni/src/main/java/java/sql/Date.java
diff --git a/sql/src/main/java/java/sql/Driver.java b/luni/src/main/java/java/sql/Driver.java
index 207aec5..207aec5 100644
--- a/sql/src/main/java/java/sql/Driver.java
+++ b/luni/src/main/java/java/sql/Driver.java
diff --git a/sql/src/main/java/java/sql/DriverManager.java b/luni/src/main/java/java/sql/DriverManager.java
index 8d3adde..8d3adde 100644
--- a/sql/src/main/java/java/sql/DriverManager.java
+++ b/luni/src/main/java/java/sql/DriverManager.java
diff --git a/sql/src/main/java/java/sql/DriverPropertyInfo.java b/luni/src/main/java/java/sql/DriverPropertyInfo.java
index aa18585..aa18585 100644
--- a/sql/src/main/java/java/sql/DriverPropertyInfo.java
+++ b/luni/src/main/java/java/sql/DriverPropertyInfo.java
diff --git a/sql/src/main/java/java/sql/ParameterMetaData.java b/luni/src/main/java/java/sql/ParameterMetaData.java
index 1e241c6..1e241c6 100644
--- a/sql/src/main/java/java/sql/ParameterMetaData.java
+++ b/luni/src/main/java/java/sql/ParameterMetaData.java
diff --git a/sql/src/main/java/java/sql/PreparedStatement.java b/luni/src/main/java/java/sql/PreparedStatement.java
index 1cd9668..1cd9668 100644
--- a/sql/src/main/java/java/sql/PreparedStatement.java
+++ b/luni/src/main/java/java/sql/PreparedStatement.java
diff --git a/sql/src/main/java/java/sql/Ref.java b/luni/src/main/java/java/sql/Ref.java
index cbc5454..cbc5454 100644
--- a/sql/src/main/java/java/sql/Ref.java
+++ b/luni/src/main/java/java/sql/Ref.java
diff --git a/sql/src/main/java/java/sql/ResultSet.java b/luni/src/main/java/java/sql/ResultSet.java
index 8ecbe6c..8ecbe6c 100644
--- a/sql/src/main/java/java/sql/ResultSet.java
+++ b/luni/src/main/java/java/sql/ResultSet.java
diff --git a/sql/src/main/java/java/sql/ResultSetMetaData.java b/luni/src/main/java/java/sql/ResultSetMetaData.java
index 097093f..097093f 100644
--- a/sql/src/main/java/java/sql/ResultSetMetaData.java
+++ b/luni/src/main/java/java/sql/ResultSetMetaData.java
diff --git a/sql/src/main/java/java/sql/SQLData.java b/luni/src/main/java/java/sql/SQLData.java
index f7dba05..f7dba05 100644
--- a/sql/src/main/java/java/sql/SQLData.java
+++ b/luni/src/main/java/java/sql/SQLData.java
diff --git a/sql/src/main/java/java/sql/SQLException.java b/luni/src/main/java/java/sql/SQLException.java
index 5022eb0..5022eb0 100644
--- a/sql/src/main/java/java/sql/SQLException.java
+++ b/luni/src/main/java/java/sql/SQLException.java
diff --git a/sql/src/main/java/java/sql/SQLInput.java b/luni/src/main/java/java/sql/SQLInput.java
index cd77a91..cd77a91 100644
--- a/sql/src/main/java/java/sql/SQLInput.java
+++ b/luni/src/main/java/java/sql/SQLInput.java
diff --git a/sql/src/main/java/java/sql/SQLOutput.java b/luni/src/main/java/java/sql/SQLOutput.java
index 6710d4f..6710d4f 100644
--- a/sql/src/main/java/java/sql/SQLOutput.java
+++ b/luni/src/main/java/java/sql/SQLOutput.java
diff --git a/sql/src/main/java/java/sql/SQLPermission.java b/luni/src/main/java/java/sql/SQLPermission.java
index 85dff72..85dff72 100644
--- a/sql/src/main/java/java/sql/SQLPermission.java
+++ b/luni/src/main/java/java/sql/SQLPermission.java
diff --git a/sql/src/main/java/java/sql/SQLWarning.java b/luni/src/main/java/java/sql/SQLWarning.java
index 9089984..9089984 100644
--- a/sql/src/main/java/java/sql/SQLWarning.java
+++ b/luni/src/main/java/java/sql/SQLWarning.java
diff --git a/sql/src/main/java/java/sql/Savepoint.java b/luni/src/main/java/java/sql/Savepoint.java
index 0c65515..0c65515 100644
--- a/sql/src/main/java/java/sql/Savepoint.java
+++ b/luni/src/main/java/java/sql/Savepoint.java
diff --git a/sql/src/main/java/java/sql/Statement.java b/luni/src/main/java/java/sql/Statement.java
index 6f2a1ed..6f2a1ed 100644
--- a/sql/src/main/java/java/sql/Statement.java
+++ b/luni/src/main/java/java/sql/Statement.java
diff --git a/sql/src/main/java/java/sql/Struct.java b/luni/src/main/java/java/sql/Struct.java
index 4d94d49..4d94d49 100644
--- a/sql/src/main/java/java/sql/Struct.java
+++ b/luni/src/main/java/java/sql/Struct.java
diff --git a/sql/src/main/java/java/sql/Time.java b/luni/src/main/java/java/sql/Time.java
index d522ef8..d522ef8 100644
--- a/sql/src/main/java/java/sql/Time.java
+++ b/luni/src/main/java/java/sql/Time.java
diff --git a/sql/src/main/java/java/sql/Timestamp.java b/luni/src/main/java/java/sql/Timestamp.java
index 9f5ef31..9f5ef31 100644
--- a/sql/src/main/java/java/sql/Timestamp.java
+++ b/luni/src/main/java/java/sql/Timestamp.java
diff --git a/sql/src/main/java/java/sql/Types.java b/luni/src/main/java/java/sql/Types.java
index fed8671..fed8671 100644
--- a/sql/src/main/java/java/sql/Types.java
+++ b/luni/src/main/java/java/sql/Types.java
diff --git a/sql/src/main/java/java/sql/package.html b/luni/src/main/java/java/sql/package.html
index 0799bb7..0799bb7 100644
--- a/sql/src/main/java/java/sql/package.html
+++ b/luni/src/main/java/java/sql/package.html
diff --git a/text/src/main/java/java/text/Annotation.java b/luni/src/main/java/java/text/Annotation.java
index 4023449..4023449 100644
--- a/text/src/main/java/java/text/Annotation.java
+++ b/luni/src/main/java/java/text/Annotation.java
diff --git a/text/src/main/java/java/text/AttributedCharacterIterator.java b/luni/src/main/java/java/text/AttributedCharacterIterator.java
index 968a589..968a589 100644
--- a/text/src/main/java/java/text/AttributedCharacterIterator.java
+++ b/luni/src/main/java/java/text/AttributedCharacterIterator.java
diff --git a/text/src/main/java/java/text/AttributedString.java b/luni/src/main/java/java/text/AttributedString.java
index 7295198..7295198 100644
--- a/text/src/main/java/java/text/AttributedString.java
+++ b/luni/src/main/java/java/text/AttributedString.java
diff --git a/text/src/main/java/java/text/Bidi.java b/luni/src/main/java/java/text/Bidi.java
index 92ca7ac..92ca7ac 100644
--- a/text/src/main/java/java/text/Bidi.java
+++ b/luni/src/main/java/java/text/Bidi.java
diff --git a/text/src/main/java/java/text/BreakIterator.java b/luni/src/main/java/java/text/BreakIterator.java
index a858b46..a858b46 100644
--- a/text/src/main/java/java/text/BreakIterator.java
+++ b/luni/src/main/java/java/text/BreakIterator.java
diff --git a/text/src/main/java/java/text/CharacterIterator.java b/luni/src/main/java/java/text/CharacterIterator.java
index 81c1fa4..81c1fa4 100644
--- a/text/src/main/java/java/text/CharacterIterator.java
+++ b/luni/src/main/java/java/text/CharacterIterator.java
diff --git a/text/src/main/java/java/text/ChoiceFormat.java b/luni/src/main/java/java/text/ChoiceFormat.java
index 1a61781..1a61781 100644
--- a/text/src/main/java/java/text/ChoiceFormat.java
+++ b/luni/src/main/java/java/text/ChoiceFormat.java
diff --git a/text/src/main/java/java/text/CollationElementIterator.java b/luni/src/main/java/java/text/CollationElementIterator.java
index 863821c..863821c 100644
--- a/text/src/main/java/java/text/CollationElementIterator.java
+++ b/luni/src/main/java/java/text/CollationElementIterator.java
diff --git a/text/src/main/java/java/text/CollationKey.java b/luni/src/main/java/java/text/CollationKey.java
index 946f462..946f462 100644
--- a/text/src/main/java/java/text/CollationKey.java
+++ b/luni/src/main/java/java/text/CollationKey.java
diff --git a/text/src/main/java/java/text/Collator.java b/luni/src/main/java/java/text/Collator.java
index 3495d2d..3495d2d 100644
--- a/text/src/main/java/java/text/Collator.java
+++ b/luni/src/main/java/java/text/Collator.java
diff --git a/text/src/main/java/java/text/DateFormat.java b/luni/src/main/java/java/text/DateFormat.java
index 0b44aad..0b44aad 100644
--- a/text/src/main/java/java/text/DateFormat.java
+++ b/luni/src/main/java/java/text/DateFormat.java
diff --git a/text/src/main/java/java/text/DateFormatSymbols.java b/luni/src/main/java/java/text/DateFormatSymbols.java
index d586ae1..d586ae1 100644
--- a/text/src/main/java/java/text/DateFormatSymbols.java
+++ b/luni/src/main/java/java/text/DateFormatSymbols.java
diff --git a/text/src/main/java/java/text/DecimalFormat.java b/luni/src/main/java/java/text/DecimalFormat.java
index d7ac012..d7ac012 100644
--- a/text/src/main/java/java/text/DecimalFormat.java
+++ b/luni/src/main/java/java/text/DecimalFormat.java
diff --git a/text/src/main/java/java/text/DecimalFormatSymbols.java b/luni/src/main/java/java/text/DecimalFormatSymbols.java
index a32f6cf..a32f6cf 100644
--- a/text/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/luni/src/main/java/java/text/DecimalFormatSymbols.java
diff --git a/text/src/main/java/java/text/FieldPosition.java b/luni/src/main/java/java/text/FieldPosition.java
index d2da297..d2da297 100644
--- a/text/src/main/java/java/text/FieldPosition.java
+++ b/luni/src/main/java/java/text/FieldPosition.java
diff --git a/text/src/main/java/java/text/Format.java b/luni/src/main/java/java/text/Format.java
index 0ebaba5..0ebaba5 100644
--- a/text/src/main/java/java/text/Format.java
+++ b/luni/src/main/java/java/text/Format.java
diff --git a/text/src/main/java/java/text/MessageFormat.java b/luni/src/main/java/java/text/MessageFormat.java
index d770869..d770869 100644
--- a/text/src/main/java/java/text/MessageFormat.java
+++ b/luni/src/main/java/java/text/MessageFormat.java
diff --git a/text/src/main/java/java/text/Normalizer.java b/luni/src/main/java/java/text/Normalizer.java
index cc9819c..cc9819c 100644
--- a/text/src/main/java/java/text/Normalizer.java
+++ b/luni/src/main/java/java/text/Normalizer.java
diff --git a/text/src/main/java/java/text/NumberFormat.java b/luni/src/main/java/java/text/NumberFormat.java
index a4cccc0..a4cccc0 100644
--- a/text/src/main/java/java/text/NumberFormat.java
+++ b/luni/src/main/java/java/text/NumberFormat.java
diff --git a/text/src/main/java/java/text/ParseException.java b/luni/src/main/java/java/text/ParseException.java
index b5a9c62..b5a9c62 100644
--- a/text/src/main/java/java/text/ParseException.java
+++ b/luni/src/main/java/java/text/ParseException.java
diff --git a/text/src/main/java/java/text/ParsePosition.java b/luni/src/main/java/java/text/ParsePosition.java
index c643df9..c643df9 100644
--- a/text/src/main/java/java/text/ParsePosition.java
+++ b/luni/src/main/java/java/text/ParsePosition.java
diff --git a/text/src/main/java/java/text/RuleBasedBreakIterator.java b/luni/src/main/java/java/text/RuleBasedBreakIterator.java
index 2537f0c..2537f0c 100644
--- a/text/src/main/java/java/text/RuleBasedBreakIterator.java
+++ b/luni/src/main/java/java/text/RuleBasedBreakIterator.java
diff --git a/text/src/main/java/java/text/RuleBasedCollator.java b/luni/src/main/java/java/text/RuleBasedCollator.java
index 0955f89..0955f89 100644
--- a/text/src/main/java/java/text/RuleBasedCollator.java
+++ b/luni/src/main/java/java/text/RuleBasedCollator.java
diff --git a/text/src/main/java/java/text/SimpleDateFormat.java b/luni/src/main/java/java/text/SimpleDateFormat.java
index cb114a3..cb114a3 100644
--- a/text/src/main/java/java/text/SimpleDateFormat.java
+++ b/luni/src/main/java/java/text/SimpleDateFormat.java
diff --git a/text/src/main/java/java/text/StringCharacterIterator.java b/luni/src/main/java/java/text/StringCharacterIterator.java
index ea60180..ea60180 100644
--- a/text/src/main/java/java/text/StringCharacterIterator.java
+++ b/luni/src/main/java/java/text/StringCharacterIterator.java
diff --git a/text/src/main/java/java/text/package.html b/luni/src/main/java/java/text/package.html
index b3f387a..b3f387a 100644
--- a/text/src/main/java/java/text/package.html
+++ b/luni/src/main/java/java/text/package.html
diff --git a/text/src/main/java/java/text/spi/BreakIteratorProvider.java b/luni/src/main/java/java/text/spi/BreakIteratorProvider.java
index e2f85d7..e2f85d7 100644
--- a/text/src/main/java/java/text/spi/BreakIteratorProvider.java
+++ b/luni/src/main/java/java/text/spi/BreakIteratorProvider.java
diff --git a/text/src/main/java/java/text/spi/CollatorProvider.java b/luni/src/main/java/java/text/spi/CollatorProvider.java
index 8d234a1..8d234a1 100644
--- a/text/src/main/java/java/text/spi/CollatorProvider.java
+++ b/luni/src/main/java/java/text/spi/CollatorProvider.java
diff --git a/text/src/main/java/java/text/spi/DateFormatProvider.java b/luni/src/main/java/java/text/spi/DateFormatProvider.java
index ba17cb4..ba17cb4 100644
--- a/text/src/main/java/java/text/spi/DateFormatProvider.java
+++ b/luni/src/main/java/java/text/spi/DateFormatProvider.java
diff --git a/text/src/main/java/java/text/spi/DateFormatSymbolsProvider.java b/luni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
index 8467f05..8467f05 100644
--- a/text/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
+++ b/luni/src/main/java/java/text/spi/DateFormatSymbolsProvider.java
diff --git a/text/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java b/luni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
index 81dbd4a..81dbd4a 100644
--- a/text/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
+++ b/luni/src/main/java/java/text/spi/DecimalFormatSymbolsProvider.java
diff --git a/text/src/main/java/java/text/spi/NumberFormatProvider.java b/luni/src/main/java/java/text/spi/NumberFormatProvider.java
index f6d43e0..f6d43e0 100644
--- a/text/src/main/java/java/text/spi/NumberFormatProvider.java
+++ b/luni/src/main/java/java/text/spi/NumberFormatProvider.java
diff --git a/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java b/luni/src/main/java/java/util/concurrent/AbstractExecutorService.java
index a7c8fe5..a7c8fe5 100644
--- a/concurrent/src/main/java/java/util/concurrent/AbstractExecutorService.java
+++ b/luni/src/main/java/java/util/concurrent/AbstractExecutorService.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java b/luni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
index 1c6f613..1c6f613 100644
--- a/concurrent/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/ArrayBlockingQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/BlockingDeque.java b/luni/src/main/java/java/util/concurrent/BlockingDeque.java
index d77a965..d77a965 100644
--- a/concurrent/src/main/java/java/util/concurrent/BlockingDeque.java
+++ b/luni/src/main/java/java/util/concurrent/BlockingDeque.java
diff --git a/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java b/luni/src/main/java/java/util/concurrent/BlockingQueue.java
index 85945b9..85945b9 100644
--- a/concurrent/src/main/java/java/util/concurrent/BlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/BlockingQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java b/luni/src/main/java/java/util/concurrent/BrokenBarrierException.java
index 3f93fbb..3f93fbb 100644
--- a/concurrent/src/main/java/java/util/concurrent/BrokenBarrierException.java
+++ b/luni/src/main/java/java/util/concurrent/BrokenBarrierException.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Callable.java b/luni/src/main/java/java/util/concurrent/Callable.java
index abc4d04..abc4d04 100644
--- a/concurrent/src/main/java/java/util/concurrent/Callable.java
+++ b/luni/src/main/java/java/util/concurrent/Callable.java
diff --git a/concurrent/src/main/java/java/util/concurrent/CancellationException.java b/luni/src/main/java/java/util/concurrent/CancellationException.java
index 2c29544..2c29544 100644
--- a/concurrent/src/main/java/java/util/concurrent/CancellationException.java
+++ b/luni/src/main/java/java/util/concurrent/CancellationException.java
diff --git a/concurrent/src/main/java/java/util/concurrent/CompletionService.java b/luni/src/main/java/java/util/concurrent/CompletionService.java
index df9f719..df9f719 100644
--- a/concurrent/src/main/java/java/util/concurrent/CompletionService.java
+++ b/luni/src/main/java/java/util/concurrent/CompletionService.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentHashMap.java
index 1c157b4..1c157b4 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentHashMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentHashMap.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java b/luni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java
index ee3534e..ee3534e 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentLinkedDeque.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java b/luni/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
index 2d222c1..2d222c1 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentLinkedQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentMap.java
index 2daebc5..2daebc5 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentMap.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java
index 7d86afb..7d86afb 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentNavigableMap.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java
index d73d163..d73d163 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListMap.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java
index 7fd1c76..7fd1c76 100644
--- a/concurrent/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java
+++ b/luni/src/main/java/java/util/concurrent/ConcurrentSkipListSet.java
diff --git a/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java b/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
index 237c5df..237c5df 100644
--- a/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
+++ b/luni/src/main/java/java/util/concurrent/CopyOnWriteArrayList.java
diff --git a/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java b/luni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
index 65a05de..65a05de 100644
--- a/concurrent/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
+++ b/luni/src/main/java/java/util/concurrent/CopyOnWriteArraySet.java
diff --git a/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java b/luni/src/main/java/java/util/concurrent/CountDownLatch.java
index 2b945dd..2b945dd 100644
--- a/concurrent/src/main/java/java/util/concurrent/CountDownLatch.java
+++ b/luni/src/main/java/java/util/concurrent/CountDownLatch.java
diff --git a/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java b/luni/src/main/java/java/util/concurrent/CyclicBarrier.java
index d5738c5..d5738c5 100644
--- a/concurrent/src/main/java/java/util/concurrent/CyclicBarrier.java
+++ b/luni/src/main/java/java/util/concurrent/CyclicBarrier.java
diff --git a/concurrent/src/main/java/java/util/concurrent/DelayQueue.java b/luni/src/main/java/java/util/concurrent/DelayQueue.java
index 52ac4a0..52ac4a0 100644
--- a/concurrent/src/main/java/java/util/concurrent/DelayQueue.java
+++ b/luni/src/main/java/java/util/concurrent/DelayQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Delayed.java b/luni/src/main/java/java/util/concurrent/Delayed.java
index b1ff4ee..b1ff4ee 100644
--- a/concurrent/src/main/java/java/util/concurrent/Delayed.java
+++ b/luni/src/main/java/java/util/concurrent/Delayed.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Exchanger.java b/luni/src/main/java/java/util/concurrent/Exchanger.java
index bb2193c..bb2193c 100644
--- a/concurrent/src/main/java/java/util/concurrent/Exchanger.java
+++ b/luni/src/main/java/java/util/concurrent/Exchanger.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ExecutionException.java b/luni/src/main/java/java/util/concurrent/ExecutionException.java
index bc561e5..bc561e5 100644
--- a/concurrent/src/main/java/java/util/concurrent/ExecutionException.java
+++ b/luni/src/main/java/java/util/concurrent/ExecutionException.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Executor.java b/luni/src/main/java/java/util/concurrent/Executor.java
index a61e921..a61e921 100644
--- a/concurrent/src/main/java/java/util/concurrent/Executor.java
+++ b/luni/src/main/java/java/util/concurrent/Executor.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java b/luni/src/main/java/java/util/concurrent/ExecutorCompletionService.java
index bf4a584..bf4a584 100644
--- a/concurrent/src/main/java/java/util/concurrent/ExecutorCompletionService.java
+++ b/luni/src/main/java/java/util/concurrent/ExecutorCompletionService.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ExecutorService.java b/luni/src/main/java/java/util/concurrent/ExecutorService.java
index ddd77bf..ddd77bf 100644
--- a/concurrent/src/main/java/java/util/concurrent/ExecutorService.java
+++ b/luni/src/main/java/java/util/concurrent/ExecutorService.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Executors.java b/luni/src/main/java/java/util/concurrent/Executors.java
index 96f6c15..96f6c15 100644
--- a/concurrent/src/main/java/java/util/concurrent/Executors.java
+++ b/luni/src/main/java/java/util/concurrent/Executors.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Future.java b/luni/src/main/java/java/util/concurrent/Future.java
index 0459ee4..0459ee4 100644
--- a/concurrent/src/main/java/java/util/concurrent/Future.java
+++ b/luni/src/main/java/java/util/concurrent/Future.java
diff --git a/concurrent/src/main/java/java/util/concurrent/FutureTask.java b/luni/src/main/java/java/util/concurrent/FutureTask.java
index 6bd13f9..6bd13f9 100644
--- a/concurrent/src/main/java/java/util/concurrent/FutureTask.java
+++ b/luni/src/main/java/java/util/concurrent/FutureTask.java
diff --git a/concurrent/src/main/java/java/util/concurrent/LinkedBlockingDeque.java b/luni/src/main/java/java/util/concurrent/LinkedBlockingDeque.java
index 196ea76..196ea76 100644
--- a/concurrent/src/main/java/java/util/concurrent/LinkedBlockingDeque.java
+++ b/luni/src/main/java/java/util/concurrent/LinkedBlockingDeque.java
diff --git a/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java b/luni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
index 1a8e412..1a8e412 100644
--- a/concurrent/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/LinkedBlockingQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java b/luni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
index 35d7b89..35d7b89 100644
--- a/concurrent/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
+++ b/luni/src/main/java/java/util/concurrent/PriorityBlockingQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java b/luni/src/main/java/java/util/concurrent/RejectedExecutionException.java
index 30b043d..30b043d 100644
--- a/concurrent/src/main/java/java/util/concurrent/RejectedExecutionException.java
+++ b/luni/src/main/java/java/util/concurrent/RejectedExecutionException.java
diff --git a/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java b/luni/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
index 417a27c..417a27c 100644
--- a/concurrent/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
+++ b/luni/src/main/java/java/util/concurrent/RejectedExecutionHandler.java
diff --git a/concurrent/src/main/java/java/util/concurrent/RunnableFuture.java b/luni/src/main/java/java/util/concurrent/RunnableFuture.java
index d74211d..d74211d 100644
--- a/concurrent/src/main/java/java/util/concurrent/RunnableFuture.java
+++ b/luni/src/main/java/java/util/concurrent/RunnableFuture.java
diff --git a/concurrent/src/main/java/java/util/concurrent/RunnableScheduledFuture.java b/luni/src/main/java/java/util/concurrent/RunnableScheduledFuture.java
index 0e8cc32..0e8cc32 100644
--- a/concurrent/src/main/java/java/util/concurrent/RunnableScheduledFuture.java
+++ b/luni/src/main/java/java/util/concurrent/RunnableScheduledFuture.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java b/luni/src/main/java/java/util/concurrent/ScheduledExecutorService.java
index c170c4a..c170c4a 100644
--- a/concurrent/src/main/java/java/util/concurrent/ScheduledExecutorService.java
+++ b/luni/src/main/java/java/util/concurrent/ScheduledExecutorService.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java b/luni/src/main/java/java/util/concurrent/ScheduledFuture.java
index 239d681..239d681 100644
--- a/concurrent/src/main/java/java/util/concurrent/ScheduledFuture.java
+++ b/luni/src/main/java/java/util/concurrent/ScheduledFuture.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java b/luni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
index 7e69936..7e69936 100644
--- a/concurrent/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
+++ b/luni/src/main/java/java/util/concurrent/ScheduledThreadPoolExecutor.java
diff --git a/concurrent/src/main/java/java/util/concurrent/Semaphore.java b/luni/src/main/java/java/util/concurrent/Semaphore.java
index 1f5c00e..1f5c00e 100644
--- a/concurrent/src/main/java/java/util/concurrent/Semaphore.java
+++ b/luni/src/main/java/java/util/concurrent/Semaphore.java
diff --git a/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java b/luni/src/main/java/java/util/concurrent/SynchronousQueue.java
index 5f9e8d7..5f9e8d7 100644
--- a/concurrent/src/main/java/java/util/concurrent/SynchronousQueue.java
+++ b/luni/src/main/java/java/util/concurrent/SynchronousQueue.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java b/luni/src/main/java/java/util/concurrent/ThreadFactory.java
index 2f0fb1a..2f0fb1a 100644
--- a/concurrent/src/main/java/java/util/concurrent/ThreadFactory.java
+++ b/luni/src/main/java/java/util/concurrent/ThreadFactory.java
diff --git a/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java b/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
index c362c99..c362c99 100644
--- a/concurrent/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
+++ b/luni/src/main/java/java/util/concurrent/ThreadPoolExecutor.java
diff --git a/concurrent/src/main/java/java/util/concurrent/TimeUnit.java b/luni/src/main/java/java/util/concurrent/TimeUnit.java
index ae78fda..ae78fda 100644
--- a/concurrent/src/main/java/java/util/concurrent/TimeUnit.java
+++ b/luni/src/main/java/java/util/concurrent/TimeUnit.java
diff --git a/concurrent/src/main/java/java/util/concurrent/TimeoutException.java b/luni/src/main/java/java/util/concurrent/TimeoutException.java
index 8b84f28..8b84f28 100644
--- a/concurrent/src/main/java/java/util/concurrent/TimeoutException.java
+++ b/luni/src/main/java/java/util/concurrent/TimeoutException.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
index c774d21..c774d21 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicBoolean.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
index 16dd568..16dd568 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicInteger.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
index b6d6cc5..b6d6cc5 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerArray.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
index 476bb0a..476bb0a 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicLong.java
index e1f5dc7..e1f5dc7 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLong.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicLong.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
index 33e6914..33e6914 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongArray.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
index 427a9e1..427a9e1 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicLongFieldUpdater.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
index 4877dc4..4877dc4 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicMarkableReference.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicReference.java
index f041bbd..f041bbd 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReference.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicReference.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
index 2501c2b..2501c2b 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceArray.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
index e53f2e9..e53f2e9 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java b/luni/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
index a1d535f..a1d535f 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/AtomicStampedReference.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/UnsafeAccess.java b/luni/src/main/java/java/util/concurrent/atomic/UnsafeAccess.java
index 96fff17..96fff17 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/UnsafeAccess.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/UnsafeAccess.java
diff --git a/concurrent/src/main/java/java/util/concurrent/atomic/package-info.java b/luni/src/main/java/java/util/concurrent/atomic/package-info.java
index 4a4375d..4a4375d 100644
--- a/concurrent/src/main/java/java/util/concurrent/atomic/package-info.java
+++ b/luni/src/main/java/java/util/concurrent/atomic/package-info.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
index f3780e5..f3780e5 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
+++ b/luni/src/main/java/java/util/concurrent/locks/AbstractOwnableSynchronizer.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
index d805259..d805259 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
+++ b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
index 66498e3..66498e3 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
+++ b/luni/src/main/java/java/util/concurrent/locks/AbstractQueuedSynchronizer.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/Condition.java b/luni/src/main/java/java/util/concurrent/locks/Condition.java
index d75de51..d75de51 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/Condition.java
+++ b/luni/src/main/java/java/util/concurrent/locks/Condition.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/Lock.java b/luni/src/main/java/java/util/concurrent/locks/Lock.java
index 4b9abd6..4b9abd6 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/Lock.java
+++ b/luni/src/main/java/java/util/concurrent/locks/Lock.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java b/luni/src/main/java/java/util/concurrent/locks/LockSupport.java
index ac9a94f..ac9a94f 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/LockSupport.java
+++ b/luni/src/main/java/java/util/concurrent/locks/LockSupport.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/ReadWriteLock.java b/luni/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
index 484f68d..484f68d 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
+++ b/luni/src/main/java/java/util/concurrent/locks/ReadWriteLock.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/ReentrantLock.java b/luni/src/main/java/java/util/concurrent/locks/ReentrantLock.java
index bf2ac38..bf2ac38 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/ReentrantLock.java
+++ b/luni/src/main/java/java/util/concurrent/locks/ReentrantLock.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java b/luni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
index bfaff06..bfaff06 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
+++ b/luni/src/main/java/java/util/concurrent/locks/ReentrantReadWriteLock.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/UnsafeAccess.java b/luni/src/main/java/java/util/concurrent/locks/UnsafeAccess.java
index 07f64e4..07f64e4 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/UnsafeAccess.java
+++ b/luni/src/main/java/java/util/concurrent/locks/UnsafeAccess.java
diff --git a/concurrent/src/main/java/java/util/concurrent/locks/package-info.java b/luni/src/main/java/java/util/concurrent/locks/package-info.java
index 860acdd..860acdd 100644
--- a/concurrent/src/main/java/java/util/concurrent/locks/package-info.java
+++ b/luni/src/main/java/java/util/concurrent/locks/package-info.java
diff --git a/concurrent/src/main/java/java/util/concurrent/package-info.java b/luni/src/main/java/java/util/concurrent/package-info.java
index dd3a22d..dd3a22d 100644
--- a/concurrent/src/main/java/java/util/concurrent/package-info.java
+++ b/luni/src/main/java/java/util/concurrent/package-info.java
diff --git a/archive/src/main/java/java/util/jar/Attributes.java b/luni/src/main/java/java/util/jar/Attributes.java
index adc598d..adc598d 100644
--- a/archive/src/main/java/java/util/jar/Attributes.java
+++ b/luni/src/main/java/java/util/jar/Attributes.java
diff --git a/archive/src/main/java/java/util/jar/InitManifest.java b/luni/src/main/java/java/util/jar/InitManifest.java
index 22baaf5..22baaf5 100644
--- a/archive/src/main/java/java/util/jar/InitManifest.java
+++ b/luni/src/main/java/java/util/jar/InitManifest.java
diff --git a/archive/src/main/java/java/util/jar/JarEntry.java b/luni/src/main/java/java/util/jar/JarEntry.java
index 29d64a9..29d64a9 100644
--- a/archive/src/main/java/java/util/jar/JarEntry.java
+++ b/luni/src/main/java/java/util/jar/JarEntry.java
diff --git a/archive/src/main/java/java/util/jar/JarException.java b/luni/src/main/java/java/util/jar/JarException.java
index 92f61f3..92f61f3 100644
--- a/archive/src/main/java/java/util/jar/JarException.java
+++ b/luni/src/main/java/java/util/jar/JarException.java
diff --git a/archive/src/main/java/java/util/jar/JarFile.java b/luni/src/main/java/java/util/jar/JarFile.java
index bebc82e..bebc82e 100644
--- a/archive/src/main/java/java/util/jar/JarFile.java
+++ b/luni/src/main/java/java/util/jar/JarFile.java
diff --git a/archive/src/main/java/java/util/jar/JarInputStream.java b/luni/src/main/java/java/util/jar/JarInputStream.java
index 952f3f8..952f3f8 100644
--- a/archive/src/main/java/java/util/jar/JarInputStream.java
+++ b/luni/src/main/java/java/util/jar/JarInputStream.java
diff --git a/archive/src/main/java/java/util/jar/JarOutputStream.java b/luni/src/main/java/java/util/jar/JarOutputStream.java
index 78e3aa5..78e3aa5 100644
--- a/archive/src/main/java/java/util/jar/JarOutputStream.java
+++ b/luni/src/main/java/java/util/jar/JarOutputStream.java
diff --git a/archive/src/main/java/java/util/jar/JarVerifier.java b/luni/src/main/java/java/util/jar/JarVerifier.java
index 519b1e1..519b1e1 100644
--- a/archive/src/main/java/java/util/jar/JarVerifier.java
+++ b/luni/src/main/java/java/util/jar/JarVerifier.java
diff --git a/archive/src/main/java/java/util/jar/Manifest.java b/luni/src/main/java/java/util/jar/Manifest.java
index 48dc8c8..48dc8c8 100644
--- a/archive/src/main/java/java/util/jar/Manifest.java
+++ b/luni/src/main/java/java/util/jar/Manifest.java
diff --git a/archive/src/main/java/java/util/jar/Pack200.java b/luni/src/main/java/java/util/jar/Pack200.java
index 9cb045e..9cb045e 100644
--- a/archive/src/main/java/java/util/jar/Pack200.java
+++ b/luni/src/main/java/java/util/jar/Pack200.java
diff --git a/archive/src/main/java/java/util/jar/package.html b/luni/src/main/java/java/util/jar/package.html
index 21103cc..21103cc 100644
--- a/archive/src/main/java/java/util/jar/package.html
+++ b/luni/src/main/java/java/util/jar/package.html
diff --git a/logging/src/main/java/java/util/logging/ConsoleHandler.java b/luni/src/main/java/java/util/logging/ConsoleHandler.java
index ef365ca..ef365ca 100644
--- a/logging/src/main/java/java/util/logging/ConsoleHandler.java
+++ b/luni/src/main/java/java/util/logging/ConsoleHandler.java
diff --git a/logging/src/main/java/java/util/logging/ErrorManager.java b/luni/src/main/java/java/util/logging/ErrorManager.java
index 6570fa7..6570fa7 100644
--- a/logging/src/main/java/java/util/logging/ErrorManager.java
+++ b/luni/src/main/java/java/util/logging/ErrorManager.java
diff --git a/logging/src/main/java/java/util/logging/FileHandler.java b/luni/src/main/java/java/util/logging/FileHandler.java
index 3d61d7d..3d61d7d 100644
--- a/logging/src/main/java/java/util/logging/FileHandler.java
+++ b/luni/src/main/java/java/util/logging/FileHandler.java
diff --git a/logging/src/main/java/java/util/logging/Filter.java b/luni/src/main/java/java/util/logging/Filter.java
index f5dbd9f..f5dbd9f 100644
--- a/logging/src/main/java/java/util/logging/Filter.java
+++ b/luni/src/main/java/java/util/logging/Filter.java
diff --git a/logging/src/main/java/java/util/logging/Formatter.java b/luni/src/main/java/java/util/logging/Formatter.java
index f9b0d25..f9b0d25 100644
--- a/logging/src/main/java/java/util/logging/Formatter.java
+++ b/luni/src/main/java/java/util/logging/Formatter.java
diff --git a/logging/src/main/java/java/util/logging/Handler.java b/luni/src/main/java/java/util/logging/Handler.java
index d1aaef2..d1aaef2 100644
--- a/logging/src/main/java/java/util/logging/Handler.java
+++ b/luni/src/main/java/java/util/logging/Handler.java
diff --git a/logging/src/main/java/java/util/logging/Level.java b/luni/src/main/java/java/util/logging/Level.java
index 2c7ac53..2c7ac53 100644
--- a/logging/src/main/java/java/util/logging/Level.java
+++ b/luni/src/main/java/java/util/logging/Level.java
diff --git a/logging/src/main/java/java/util/logging/LogManager.java b/luni/src/main/java/java/util/logging/LogManager.java
index c07f6bf..c07f6bf 100644
--- a/logging/src/main/java/java/util/logging/LogManager.java
+++ b/luni/src/main/java/java/util/logging/LogManager.java
diff --git a/logging/src/main/java/java/util/logging/LogRecord.java b/luni/src/main/java/java/util/logging/LogRecord.java
index d4466bf..d4466bf 100644
--- a/logging/src/main/java/java/util/logging/LogRecord.java
+++ b/luni/src/main/java/java/util/logging/LogRecord.java
diff --git a/logging/src/main/java/java/util/logging/Logger.java b/luni/src/main/java/java/util/logging/Logger.java
index 8271022..8271022 100644
--- a/logging/src/main/java/java/util/logging/Logger.java
+++ b/luni/src/main/java/java/util/logging/Logger.java
diff --git a/logging/src/main/java/java/util/logging/LoggingMXBean.java b/luni/src/main/java/java/util/logging/LoggingMXBean.java
index 18cc4cc..18cc4cc 100644
--- a/logging/src/main/java/java/util/logging/LoggingMXBean.java
+++ b/luni/src/main/java/java/util/logging/LoggingMXBean.java
diff --git a/logging/src/main/java/java/util/logging/LoggingPermission.java b/luni/src/main/java/java/util/logging/LoggingPermission.java
index 5ca9cc9..5ca9cc9 100644
--- a/logging/src/main/java/java/util/logging/LoggingPermission.java
+++ b/luni/src/main/java/java/util/logging/LoggingPermission.java
diff --git a/logging/src/main/java/java/util/logging/MemoryHandler.java b/luni/src/main/java/java/util/logging/MemoryHandler.java
index c1b36c8..c1b36c8 100644
--- a/logging/src/main/java/java/util/logging/MemoryHandler.java
+++ b/luni/src/main/java/java/util/logging/MemoryHandler.java
diff --git a/logging/src/main/java/java/util/logging/SimpleFormatter.java b/luni/src/main/java/java/util/logging/SimpleFormatter.java
index def4ad3..def4ad3 100644
--- a/logging/src/main/java/java/util/logging/SimpleFormatter.java
+++ b/luni/src/main/java/java/util/logging/SimpleFormatter.java
diff --git a/logging/src/main/java/java/util/logging/SocketHandler.java b/luni/src/main/java/java/util/logging/SocketHandler.java
index fb854fe..fb854fe 100644
--- a/logging/src/main/java/java/util/logging/SocketHandler.java
+++ b/luni/src/main/java/java/util/logging/SocketHandler.java
diff --git a/logging/src/main/java/java/util/logging/StreamHandler.java b/luni/src/main/java/java/util/logging/StreamHandler.java
index 2a67b98..2a67b98 100644
--- a/logging/src/main/java/java/util/logging/StreamHandler.java
+++ b/luni/src/main/java/java/util/logging/StreamHandler.java
diff --git a/logging/src/main/java/java/util/logging/XMLFormatter.java b/luni/src/main/java/java/util/logging/XMLFormatter.java
index ff96813..ff96813 100644
--- a/logging/src/main/java/java/util/logging/XMLFormatter.java
+++ b/luni/src/main/java/java/util/logging/XMLFormatter.java
diff --git a/logging/src/main/java/java/util/logging/logging.properties b/luni/src/main/java/java/util/logging/logging.properties
index f99fe3f..f99fe3f 100644
--- a/logging/src/main/java/java/util/logging/logging.properties
+++ b/luni/src/main/java/java/util/logging/logging.properties
diff --git a/logging/src/main/java/java/util/logging/package.html b/luni/src/main/java/java/util/logging/package.html
index d7ed252..d7ed252 100644
--- a/logging/src/main/java/java/util/logging/package.html
+++ b/luni/src/main/java/java/util/logging/package.html
diff --git a/regex/src/main/java/java/util/regex/MatchResult.java b/luni/src/main/java/java/util/regex/MatchResult.java
index 76c17a8..76c17a8 100644
--- a/regex/src/main/java/java/util/regex/MatchResult.java
+++ b/luni/src/main/java/java/util/regex/MatchResult.java
diff --git a/regex/src/main/java/java/util/regex/MatchResultImpl.java b/luni/src/main/java/java/util/regex/MatchResultImpl.java
index 795f2f6..795f2f6 100644
--- a/regex/src/main/java/java/util/regex/MatchResultImpl.java
+++ b/luni/src/main/java/java/util/regex/MatchResultImpl.java
diff --git a/regex/src/main/java/java/util/regex/Matcher.java b/luni/src/main/java/java/util/regex/Matcher.java
index 5abbbd5..5abbbd5 100644
--- a/regex/src/main/java/java/util/regex/Matcher.java
+++ b/luni/src/main/java/java/util/regex/Matcher.java
diff --git a/regex/src/main/java/java/util/regex/Pattern.java b/luni/src/main/java/java/util/regex/Pattern.java
index 325e3e0..325e3e0 100644
--- a/regex/src/main/java/java/util/regex/Pattern.java
+++ b/luni/src/main/java/java/util/regex/Pattern.java
diff --git a/regex/src/main/java/java/util/regex/PatternSyntaxException.java b/luni/src/main/java/java/util/regex/PatternSyntaxException.java
index d59bdd4..d59bdd4 100644
--- a/regex/src/main/java/java/util/regex/PatternSyntaxException.java
+++ b/luni/src/main/java/java/util/regex/PatternSyntaxException.java
diff --git a/regex/src/main/java/java/util/regex/Splitter.java b/luni/src/main/java/java/util/regex/Splitter.java
index d30bada..d30bada 100644
--- a/regex/src/main/java/java/util/regex/Splitter.java
+++ b/luni/src/main/java/java/util/regex/Splitter.java
diff --git a/regex/src/main/java/java/util/regex/package.html b/luni/src/main/java/java/util/regex/package.html
index 3ce73eb..3ce73eb 100644
--- a/regex/src/main/java/java/util/regex/package.html
+++ b/luni/src/main/java/java/util/regex/package.html
diff --git a/archive/src/main/java/java/util/zip/Adler32.java b/luni/src/main/java/java/util/zip/Adler32.java
index ebdc996..ebdc996 100644
--- a/archive/src/main/java/java/util/zip/Adler32.java
+++ b/luni/src/main/java/java/util/zip/Adler32.java
diff --git a/archive/src/main/java/java/util/zip/CRC32.java b/luni/src/main/java/java/util/zip/CRC32.java
index 8fc6bb7..8fc6bb7 100644
--- a/archive/src/main/java/java/util/zip/CRC32.java
+++ b/luni/src/main/java/java/util/zip/CRC32.java
diff --git a/archive/src/main/java/java/util/zip/CheckedInputStream.java b/luni/src/main/java/java/util/zip/CheckedInputStream.java
index 4805ef7..4805ef7 100644
--- a/archive/src/main/java/java/util/zip/CheckedInputStream.java
+++ b/luni/src/main/java/java/util/zip/CheckedInputStream.java
diff --git a/archive/src/main/java/java/util/zip/CheckedOutputStream.java b/luni/src/main/java/java/util/zip/CheckedOutputStream.java
index 3c19726..3c19726 100644
--- a/archive/src/main/java/java/util/zip/CheckedOutputStream.java
+++ b/luni/src/main/java/java/util/zip/CheckedOutputStream.java
diff --git a/archive/src/main/java/java/util/zip/Checksum.java b/luni/src/main/java/java/util/zip/Checksum.java
index fac7e4e..fac7e4e 100644
--- a/archive/src/main/java/java/util/zip/Checksum.java
+++ b/luni/src/main/java/java/util/zip/Checksum.java
diff --git a/archive/src/main/java/java/util/zip/DataFormatException.java b/luni/src/main/java/java/util/zip/DataFormatException.java
index ec4e867..ec4e867 100644
--- a/archive/src/main/java/java/util/zip/DataFormatException.java
+++ b/luni/src/main/java/java/util/zip/DataFormatException.java
diff --git a/archive/src/main/java/java/util/zip/Deflater.java b/luni/src/main/java/java/util/zip/Deflater.java
index 41a337c..41a337c 100644
--- a/archive/src/main/java/java/util/zip/Deflater.java
+++ b/luni/src/main/java/java/util/zip/Deflater.java
diff --git a/archive/src/main/java/java/util/zip/DeflaterInputStream.java b/luni/src/main/java/java/util/zip/DeflaterInputStream.java
index 13d65e4..13d65e4 100644
--- a/archive/src/main/java/java/util/zip/DeflaterInputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterInputStream.java
diff --git a/archive/src/main/java/java/util/zip/DeflaterOutputStream.java b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
index 7ea27fa..7ea27fa 100644
--- a/archive/src/main/java/java/util/zip/DeflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
diff --git a/archive/src/main/java/java/util/zip/GZIPInputStream.java b/luni/src/main/java/java/util/zip/GZIPInputStream.java
index d7f412e..d7f412e 100644
--- a/archive/src/main/java/java/util/zip/GZIPInputStream.java
+++ b/luni/src/main/java/java/util/zip/GZIPInputStream.java
diff --git a/archive/src/main/java/java/util/zip/GZIPOutputStream.java b/luni/src/main/java/java/util/zip/GZIPOutputStream.java
index 02510db..02510db 100644
--- a/archive/src/main/java/java/util/zip/GZIPOutputStream.java
+++ b/luni/src/main/java/java/util/zip/GZIPOutputStream.java
diff --git a/archive/src/main/java/java/util/zip/Inflater.java b/luni/src/main/java/java/util/zip/Inflater.java
index 4921d3d..4921d3d 100644
--- a/archive/src/main/java/java/util/zip/Inflater.java
+++ b/luni/src/main/java/java/util/zip/Inflater.java
diff --git a/archive/src/main/java/java/util/zip/InflaterInputStream.java b/luni/src/main/java/java/util/zip/InflaterInputStream.java
index fcaf8c15..fcaf8c15 100644
--- a/archive/src/main/java/java/util/zip/InflaterInputStream.java
+++ b/luni/src/main/java/java/util/zip/InflaterInputStream.java
diff --git a/archive/src/main/java/java/util/zip/InflaterOutputStream.java b/luni/src/main/java/java/util/zip/InflaterOutputStream.java
index 1329393..1329393 100644
--- a/archive/src/main/java/java/util/zip/InflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/InflaterOutputStream.java
diff --git a/archive/src/main/java/java/util/zip/ZipConstants.java b/luni/src/main/java/java/util/zip/ZipConstants.java
index 4ce65bc..4ce65bc 100644
--- a/archive/src/main/java/java/util/zip/ZipConstants.java
+++ b/luni/src/main/java/java/util/zip/ZipConstants.java
diff --git a/archive/src/main/java/java/util/zip/ZipEntry.java b/luni/src/main/java/java/util/zip/ZipEntry.java
index d68aa2f..d68aa2f 100644
--- a/archive/src/main/java/java/util/zip/ZipEntry.java
+++ b/luni/src/main/java/java/util/zip/ZipEntry.java
diff --git a/archive/src/main/java/java/util/zip/ZipError.java b/luni/src/main/java/java/util/zip/ZipError.java
index a244d80..a244d80 100644
--- a/archive/src/main/java/java/util/zip/ZipError.java
+++ b/luni/src/main/java/java/util/zip/ZipError.java
diff --git a/archive/src/main/java/java/util/zip/ZipException.java b/luni/src/main/java/java/util/zip/ZipException.java
index ad68714..ad68714 100644
--- a/archive/src/main/java/java/util/zip/ZipException.java
+++ b/luni/src/main/java/java/util/zip/ZipException.java
diff --git a/archive/src/main/java/java/util/zip/ZipFile.java b/luni/src/main/java/java/util/zip/ZipFile.java
index a2ca35a..a2ca35a 100644
--- a/archive/src/main/java/java/util/zip/ZipFile.java
+++ b/luni/src/main/java/java/util/zip/ZipFile.java
diff --git a/archive/src/main/java/java/util/zip/ZipInputStream.java b/luni/src/main/java/java/util/zip/ZipInputStream.java
index 14141e9..14141e9 100644
--- a/archive/src/main/java/java/util/zip/ZipInputStream.java
+++ b/luni/src/main/java/java/util/zip/ZipInputStream.java
diff --git a/archive/src/main/java/java/util/zip/ZipOutputStream.java b/luni/src/main/java/java/util/zip/ZipOutputStream.java
index 3a9bd7e..3a9bd7e 100644
--- a/archive/src/main/java/java/util/zip/ZipOutputStream.java
+++ b/luni/src/main/java/java/util/zip/ZipOutputStream.java
diff --git a/archive/src/main/java/java/util/zip/package.html b/luni/src/main/java/java/util/zip/package.html
index 8b4f91b..8b4f91b 100644
--- a/archive/src/main/java/java/util/zip/package.html
+++ b/luni/src/main/java/java/util/zip/package.html
diff --git a/crypto/src/main/java/javax/crypto/BadPaddingException.java b/luni/src/main/java/javax/crypto/BadPaddingException.java
index 5e2dd38..5e2dd38 100644
--- a/crypto/src/main/java/javax/crypto/BadPaddingException.java
+++ b/luni/src/main/java/javax/crypto/BadPaddingException.java
diff --git a/crypto/src/main/java/javax/crypto/Cipher.java b/luni/src/main/java/javax/crypto/Cipher.java
index 8e084ae..8e084ae 100644
--- a/crypto/src/main/java/javax/crypto/Cipher.java
+++ b/luni/src/main/java/javax/crypto/Cipher.java
diff --git a/crypto/src/main/java/javax/crypto/CipherInputStream.java b/luni/src/main/java/javax/crypto/CipherInputStream.java
index fb1ef27..fb1ef27 100644
--- a/crypto/src/main/java/javax/crypto/CipherInputStream.java
+++ b/luni/src/main/java/javax/crypto/CipherInputStream.java
diff --git a/crypto/src/main/java/javax/crypto/CipherOutputStream.java b/luni/src/main/java/javax/crypto/CipherOutputStream.java
index 1f95b99..1f95b99 100644
--- a/crypto/src/main/java/javax/crypto/CipherOutputStream.java
+++ b/luni/src/main/java/javax/crypto/CipherOutputStream.java
diff --git a/crypto/src/main/java/javax/crypto/CipherSpi.java b/luni/src/main/java/javax/crypto/CipherSpi.java
index 50fdd49..50fdd49 100644
--- a/crypto/src/main/java/javax/crypto/CipherSpi.java
+++ b/luni/src/main/java/javax/crypto/CipherSpi.java
diff --git a/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java b/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
index 2d0fd25..2d0fd25 100644
--- a/crypto/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
+++ b/luni/src/main/java/javax/crypto/EncryptedPrivateKeyInfo.java
diff --git a/crypto/src/main/java/javax/crypto/ExemptionMechanism.java b/luni/src/main/java/javax/crypto/ExemptionMechanism.java
index 76c88cb..76c88cb 100644
--- a/crypto/src/main/java/javax/crypto/ExemptionMechanism.java
+++ b/luni/src/main/java/javax/crypto/ExemptionMechanism.java
diff --git a/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java b/luni/src/main/java/javax/crypto/ExemptionMechanismException.java
index d094ac3..d094ac3 100644
--- a/crypto/src/main/java/javax/crypto/ExemptionMechanismException.java
+++ b/luni/src/main/java/javax/crypto/ExemptionMechanismException.java
diff --git a/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java b/luni/src/main/java/javax/crypto/ExemptionMechanismSpi.java
index 39a27f6..39a27f6 100644
--- a/crypto/src/main/java/javax/crypto/ExemptionMechanismSpi.java
+++ b/luni/src/main/java/javax/crypto/ExemptionMechanismSpi.java
diff --git a/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java b/luni/src/main/java/javax/crypto/IllegalBlockSizeException.java
index 0766b7c..0766b7c 100644
--- a/crypto/src/main/java/javax/crypto/IllegalBlockSizeException.java
+++ b/luni/src/main/java/javax/crypto/IllegalBlockSizeException.java
diff --git a/crypto/src/main/java/javax/crypto/KeyAgreement.java b/luni/src/main/java/javax/crypto/KeyAgreement.java
index 593aa37..593aa37 100644
--- a/crypto/src/main/java/javax/crypto/KeyAgreement.java
+++ b/luni/src/main/java/javax/crypto/KeyAgreement.java
diff --git a/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java b/luni/src/main/java/javax/crypto/KeyAgreementSpi.java
index 5011183..5011183 100644
--- a/crypto/src/main/java/javax/crypto/KeyAgreementSpi.java
+++ b/luni/src/main/java/javax/crypto/KeyAgreementSpi.java
diff --git a/crypto/src/main/java/javax/crypto/KeyGenerator.java b/luni/src/main/java/javax/crypto/KeyGenerator.java
index f1dd3b2..f1dd3b2 100644
--- a/crypto/src/main/java/javax/crypto/KeyGenerator.java
+++ b/luni/src/main/java/javax/crypto/KeyGenerator.java
diff --git a/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java b/luni/src/main/java/javax/crypto/KeyGeneratorSpi.java
index edbbe43..edbbe43 100644
--- a/crypto/src/main/java/javax/crypto/KeyGeneratorSpi.java
+++ b/luni/src/main/java/javax/crypto/KeyGeneratorSpi.java
diff --git a/crypto/src/main/java/javax/crypto/Mac.java b/luni/src/main/java/javax/crypto/Mac.java
index 94ea20e..94ea20e 100644
--- a/crypto/src/main/java/javax/crypto/Mac.java
+++ b/luni/src/main/java/javax/crypto/Mac.java
diff --git a/crypto/src/main/java/javax/crypto/MacSpi.java b/luni/src/main/java/javax/crypto/MacSpi.java
index b2683d2..b2683d2 100644
--- a/crypto/src/main/java/javax/crypto/MacSpi.java
+++ b/luni/src/main/java/javax/crypto/MacSpi.java
diff --git a/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java b/luni/src/main/java/javax/crypto/NoSuchPaddingException.java
index 55e1f1e..55e1f1e 100644
--- a/crypto/src/main/java/javax/crypto/NoSuchPaddingException.java
+++ b/luni/src/main/java/javax/crypto/NoSuchPaddingException.java
diff --git a/crypto/src/main/java/javax/crypto/NullCipher.java b/luni/src/main/java/javax/crypto/NullCipher.java
index fadf3ae..fadf3ae 100644
--- a/crypto/src/main/java/javax/crypto/NullCipher.java
+++ b/luni/src/main/java/javax/crypto/NullCipher.java
diff --git a/crypto/src/main/java/javax/crypto/SealedObject.java b/luni/src/main/java/javax/crypto/SealedObject.java
index bf453db..bf453db 100644
--- a/crypto/src/main/java/javax/crypto/SealedObject.java
+++ b/luni/src/main/java/javax/crypto/SealedObject.java
diff --git a/crypto/src/main/java/javax/crypto/SecretKey.java b/luni/src/main/java/javax/crypto/SecretKey.java
index ac61074..ac61074 100644
--- a/crypto/src/main/java/javax/crypto/SecretKey.java
+++ b/luni/src/main/java/javax/crypto/SecretKey.java
diff --git a/crypto/src/main/java/javax/crypto/SecretKeyFactory.java b/luni/src/main/java/javax/crypto/SecretKeyFactory.java
index 57bca3e..57bca3e 100644
--- a/crypto/src/main/java/javax/crypto/SecretKeyFactory.java
+++ b/luni/src/main/java/javax/crypto/SecretKeyFactory.java
diff --git a/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java b/luni/src/main/java/javax/crypto/SecretKeyFactorySpi.java
index 5d7764e..5d7764e 100644
--- a/crypto/src/main/java/javax/crypto/SecretKeyFactorySpi.java
+++ b/luni/src/main/java/javax/crypto/SecretKeyFactorySpi.java
diff --git a/crypto/src/main/java/javax/crypto/ShortBufferException.java b/luni/src/main/java/javax/crypto/ShortBufferException.java
index 56480a8..56480a8 100644
--- a/crypto/src/main/java/javax/crypto/ShortBufferException.java
+++ b/luni/src/main/java/javax/crypto/ShortBufferException.java
diff --git a/crypto/src/main/java/javax/crypto/interfaces/DHKey.java b/luni/src/main/java/javax/crypto/interfaces/DHKey.java
index 6ef17d4..6ef17d4 100644
--- a/crypto/src/main/java/javax/crypto/interfaces/DHKey.java
+++ b/luni/src/main/java/javax/crypto/interfaces/DHKey.java
diff --git a/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java b/luni/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
index f63e0cb..f63e0cb 100644
--- a/crypto/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
+++ b/luni/src/main/java/javax/crypto/interfaces/DHPrivateKey.java
diff --git a/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java b/luni/src/main/java/javax/crypto/interfaces/DHPublicKey.java
index 92e8f10..92e8f10 100644
--- a/crypto/src/main/java/javax/crypto/interfaces/DHPublicKey.java
+++ b/luni/src/main/java/javax/crypto/interfaces/DHPublicKey.java
diff --git a/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java b/luni/src/main/java/javax/crypto/interfaces/PBEKey.java
index c718715..c718715 100644
--- a/crypto/src/main/java/javax/crypto/interfaces/PBEKey.java
+++ b/luni/src/main/java/javax/crypto/interfaces/PBEKey.java
diff --git a/crypto/src/main/java/javax/crypto/interfaces/package.html b/luni/src/main/java/javax/crypto/interfaces/package.html
index d278318..d278318 100644
--- a/crypto/src/main/java/javax/crypto/interfaces/package.html
+++ b/luni/src/main/java/javax/crypto/interfaces/package.html
diff --git a/crypto/src/main/java/javax/crypto/package.html b/luni/src/main/java/javax/crypto/package.html
index 3239b72..3239b72 100644
--- a/crypto/src/main/java/javax/crypto/package.html
+++ b/luni/src/main/java/javax/crypto/package.html
diff --git a/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java b/luni/src/main/java/javax/crypto/spec/DESKeySpec.java
index 372a68d..372a68d 100644
--- a/crypto/src/main/java/javax/crypto/spec/DESKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DESKeySpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java b/luni/src/main/java/javax/crypto/spec/DESedeKeySpec.java
index 199eba6..199eba6 100644
--- a/crypto/src/main/java/javax/crypto/spec/DESedeKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DESedeKeySpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java b/luni/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
index f6ddc03..f6ddc03 100644
--- a/crypto/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DHGenParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java b/luni/src/main/java/javax/crypto/spec/DHParameterSpec.java
index 6030b40..6030b40 100644
--- a/crypto/src/main/java/javax/crypto/spec/DHParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DHParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java b/luni/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
index 925a003..925a003 100644
--- a/crypto/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DHPrivateKeySpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java b/luni/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
index a5d4461..a5d4461 100644
--- a/crypto/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/DHPublicKeySpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java b/luni/src/main/java/javax/crypto/spec/IvParameterSpec.java
index ce7f9d3..ce7f9d3 100644
--- a/crypto/src/main/java/javax/crypto/spec/IvParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/IvParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java b/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
index 29b572d..29b572d 100644
--- a/crypto/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/OAEPParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java
index d79fd3c..d79fd3c 100644
--- a/crypto/src/main/java/javax/crypto/spec/PBEKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/PBEKeySpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java b/luni/src/main/java/javax/crypto/spec/PBEParameterSpec.java
index cce3832..cce3832 100644
--- a/crypto/src/main/java/javax/crypto/spec/PBEParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/PBEParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/PSource.java b/luni/src/main/java/javax/crypto/spec/PSource.java
index 30fd8af..30fd8af 100644
--- a/crypto/src/main/java/javax/crypto/spec/PSource.java
+++ b/luni/src/main/java/javax/crypto/spec/PSource.java
diff --git a/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java b/luni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
index bc7a39c..bc7a39c 100644
--- a/crypto/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/RC2ParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java b/luni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
index 57010f7..57010f7 100644
--- a/crypto/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
+++ b/luni/src/main/java/javax/crypto/spec/RC5ParameterSpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
index d1eba47..d1eba47 100644
--- a/crypto/src/main/java/javax/crypto/spec/SecretKeySpec.java
+++ b/luni/src/main/java/javax/crypto/spec/SecretKeySpec.java
diff --git a/crypto/src/main/java/javax/crypto/spec/package.html b/luni/src/main/java/javax/crypto/spec/package.html
index 177ac3d..177ac3d 100644
--- a/crypto/src/main/java/javax/crypto/spec/package.html
+++ b/luni/src/main/java/javax/crypto/spec/package.html
diff --git a/auth/src/main/java/javax/security/auth/AuthPermission.java b/luni/src/main/java/javax/security/auth/AuthPermission.java
index 697d5c7..697d5c7 100644
--- a/auth/src/main/java/javax/security/auth/AuthPermission.java
+++ b/luni/src/main/java/javax/security/auth/AuthPermission.java
diff --git a/auth/src/main/java/javax/security/auth/DestroyFailedException.java b/luni/src/main/java/javax/security/auth/DestroyFailedException.java
index 27d4dfd..27d4dfd 100644
--- a/auth/src/main/java/javax/security/auth/DestroyFailedException.java
+++ b/luni/src/main/java/javax/security/auth/DestroyFailedException.java
diff --git a/auth/src/main/java/javax/security/auth/Destroyable.java b/luni/src/main/java/javax/security/auth/Destroyable.java
index b4d0fa2..b4d0fa2 100644
--- a/auth/src/main/java/javax/security/auth/Destroyable.java
+++ b/luni/src/main/java/javax/security/auth/Destroyable.java
diff --git a/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java b/luni/src/main/java/javax/security/auth/PrivateCredentialPermission.java
index 35072b8..35072b8 100644
--- a/auth/src/main/java/javax/security/auth/PrivateCredentialPermission.java
+++ b/luni/src/main/java/javax/security/auth/PrivateCredentialPermission.java
diff --git a/auth/src/main/java/javax/security/auth/Subject.java b/luni/src/main/java/javax/security/auth/Subject.java
index 5bf6bba..5bf6bba 100644
--- a/auth/src/main/java/javax/security/auth/Subject.java
+++ b/luni/src/main/java/javax/security/auth/Subject.java
diff --git a/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java b/luni/src/main/java/javax/security/auth/SubjectDomainCombiner.java
index 4b91084..4b91084 100644
--- a/auth/src/main/java/javax/security/auth/SubjectDomainCombiner.java
+++ b/luni/src/main/java/javax/security/auth/SubjectDomainCombiner.java
diff --git a/auth/src/main/java/javax/security/auth/callback/Callback.java b/luni/src/main/java/javax/security/auth/callback/Callback.java
index 4854d3f..4854d3f 100644
--- a/auth/src/main/java/javax/security/auth/callback/Callback.java
+++ b/luni/src/main/java/javax/security/auth/callback/Callback.java
diff --git a/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java b/luni/src/main/java/javax/security/auth/callback/CallbackHandler.java
index 21bf30b..21bf30b 100644
--- a/auth/src/main/java/javax/security/auth/callback/CallbackHandler.java
+++ b/luni/src/main/java/javax/security/auth/callback/CallbackHandler.java
diff --git a/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java b/luni/src/main/java/javax/security/auth/callback/PasswordCallback.java
index 3617b75..3617b75 100644
--- a/auth/src/main/java/javax/security/auth/callback/PasswordCallback.java
+++ b/luni/src/main/java/javax/security/auth/callback/PasswordCallback.java
diff --git a/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java b/luni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
index bee7bd3..bee7bd3 100644
--- a/auth/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
+++ b/luni/src/main/java/javax/security/auth/callback/UnsupportedCallbackException.java
diff --git a/auth/src/main/java/javax/security/auth/callback/package.html b/luni/src/main/java/javax/security/auth/callback/package.html
index c102954..c102954 100644
--- a/auth/src/main/java/javax/security/auth/callback/package.html
+++ b/luni/src/main/java/javax/security/auth/callback/package.html
diff --git a/auth/src/main/java/javax/security/auth/login/LoginException.java b/luni/src/main/java/javax/security/auth/login/LoginException.java
index 9433c43..9433c43 100644
--- a/auth/src/main/java/javax/security/auth/login/LoginException.java
+++ b/luni/src/main/java/javax/security/auth/login/LoginException.java
diff --git a/auth/src/main/java/javax/security/auth/login/package.html b/luni/src/main/java/javax/security/auth/login/package.html
index e270980..e270980 100644
--- a/auth/src/main/java/javax/security/auth/login/package.html
+++ b/luni/src/main/java/javax/security/auth/login/package.html
diff --git a/auth/src/main/java/javax/security/auth/package.html b/luni/src/main/java/javax/security/auth/package.html
index aeaa6cc..aeaa6cc 100644
--- a/auth/src/main/java/javax/security/auth/package.html
+++ b/luni/src/main/java/javax/security/auth/package.html
diff --git a/auth/src/main/java/javax/security/auth/x500/X500Principal.java b/luni/src/main/java/javax/security/auth/x500/X500Principal.java
index 19254a0..19254a0 100644
--- a/auth/src/main/java/javax/security/auth/x500/X500Principal.java
+++ b/luni/src/main/java/javax/security/auth/x500/X500Principal.java
diff --git a/auth/src/main/java/javax/security/auth/x500/package.html b/luni/src/main/java/javax/security/auth/x500/package.html
index f7c484e..f7c484e 100644
--- a/auth/src/main/java/javax/security/auth/x500/package.html
+++ b/luni/src/main/java/javax/security/auth/x500/package.html
diff --git a/security/src/main/java/javax/security/cert/Certificate.java b/luni/src/main/java/javax/security/cert/Certificate.java
index ef513a3..ef513a3 100644
--- a/security/src/main/java/javax/security/cert/Certificate.java
+++ b/luni/src/main/java/javax/security/cert/Certificate.java
diff --git a/security/src/main/java/javax/security/cert/CertificateEncodingException.java b/luni/src/main/java/javax/security/cert/CertificateEncodingException.java
index 780e43f..780e43f 100644
--- a/security/src/main/java/javax/security/cert/CertificateEncodingException.java
+++ b/luni/src/main/java/javax/security/cert/CertificateEncodingException.java
diff --git a/security/src/main/java/javax/security/cert/CertificateException.java b/luni/src/main/java/javax/security/cert/CertificateException.java
index fd2a614..fd2a614 100644
--- a/security/src/main/java/javax/security/cert/CertificateException.java
+++ b/luni/src/main/java/javax/security/cert/CertificateException.java
diff --git a/security/src/main/java/javax/security/cert/CertificateExpiredException.java b/luni/src/main/java/javax/security/cert/CertificateExpiredException.java
index 94e6558..94e6558 100644
--- a/security/src/main/java/javax/security/cert/CertificateExpiredException.java
+++ b/luni/src/main/java/javax/security/cert/CertificateExpiredException.java
diff --git a/security/src/main/java/javax/security/cert/CertificateNotYetValidException.java b/luni/src/main/java/javax/security/cert/CertificateNotYetValidException.java
index 8fe0a33..8fe0a33 100644
--- a/security/src/main/java/javax/security/cert/CertificateNotYetValidException.java
+++ b/luni/src/main/java/javax/security/cert/CertificateNotYetValidException.java
diff --git a/security/src/main/java/javax/security/cert/CertificateParsingException.java b/luni/src/main/java/javax/security/cert/CertificateParsingException.java
index 48986c0..48986c0 100644
--- a/security/src/main/java/javax/security/cert/CertificateParsingException.java
+++ b/luni/src/main/java/javax/security/cert/CertificateParsingException.java
diff --git a/security/src/main/java/javax/security/cert/X509Certificate.java b/luni/src/main/java/javax/security/cert/X509Certificate.java
index 8877386..8877386 100644
--- a/security/src/main/java/javax/security/cert/X509Certificate.java
+++ b/luni/src/main/java/javax/security/cert/X509Certificate.java
diff --git a/security/src/main/java/javax/security/cert/package.html b/luni/src/main/java/javax/security/cert/package.html
index 792b446..792b446 100644
--- a/security/src/main/java/javax/security/cert/package.html
+++ b/luni/src/main/java/javax/security/cert/package.html
diff --git a/sql/src/main/java/javax/sql/ConnectionEvent.java b/luni/src/main/java/javax/sql/ConnectionEvent.java
index cce8a78..cce8a78 100644
--- a/sql/src/main/java/javax/sql/ConnectionEvent.java
+++ b/luni/src/main/java/javax/sql/ConnectionEvent.java
diff --git a/sql/src/main/java/javax/sql/ConnectionEventListener.java b/luni/src/main/java/javax/sql/ConnectionEventListener.java
index eec0d5b..eec0d5b 100644
--- a/sql/src/main/java/javax/sql/ConnectionEventListener.java
+++ b/luni/src/main/java/javax/sql/ConnectionEventListener.java
diff --git a/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java b/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
index 379fde0..379fde0 100644
--- a/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java
+++ b/luni/src/main/java/javax/sql/ConnectionPoolDataSource.java
diff --git a/sql/src/main/java/javax/sql/DataSource.java b/luni/src/main/java/javax/sql/DataSource.java
index 7f73947..7f73947 100644
--- a/sql/src/main/java/javax/sql/DataSource.java
+++ b/luni/src/main/java/javax/sql/DataSource.java
diff --git a/sql/src/main/java/javax/sql/PooledConnection.java b/luni/src/main/java/javax/sql/PooledConnection.java
index b268e0c..b268e0c 100644
--- a/sql/src/main/java/javax/sql/PooledConnection.java
+++ b/luni/src/main/java/javax/sql/PooledConnection.java
diff --git a/sql/src/main/java/javax/sql/RowSet.java b/luni/src/main/java/javax/sql/RowSet.java
index 77321a2..77321a2 100644
--- a/sql/src/main/java/javax/sql/RowSet.java
+++ b/luni/src/main/java/javax/sql/RowSet.java
diff --git a/sql/src/main/java/javax/sql/RowSetEvent.java b/luni/src/main/java/javax/sql/RowSetEvent.java
index d18e9ce..d18e9ce 100644
--- a/sql/src/main/java/javax/sql/RowSetEvent.java
+++ b/luni/src/main/java/javax/sql/RowSetEvent.java
diff --git a/sql/src/main/java/javax/sql/RowSetInternal.java b/luni/src/main/java/javax/sql/RowSetInternal.java
index 78de4b0..78de4b0 100644
--- a/sql/src/main/java/javax/sql/RowSetInternal.java
+++ b/luni/src/main/java/javax/sql/RowSetInternal.java
diff --git a/sql/src/main/java/javax/sql/RowSetListener.java b/luni/src/main/java/javax/sql/RowSetListener.java
index ede0197..ede0197 100644
--- a/sql/src/main/java/javax/sql/RowSetListener.java
+++ b/luni/src/main/java/javax/sql/RowSetListener.java
diff --git a/sql/src/main/java/javax/sql/RowSetMetaData.java b/luni/src/main/java/javax/sql/RowSetMetaData.java
index ad07199..ad07199 100644
--- a/sql/src/main/java/javax/sql/RowSetMetaData.java
+++ b/luni/src/main/java/javax/sql/RowSetMetaData.java
diff --git a/sql/src/main/java/javax/sql/RowSetReader.java b/luni/src/main/java/javax/sql/RowSetReader.java
index 0ff5c90..0ff5c90 100644
--- a/sql/src/main/java/javax/sql/RowSetReader.java
+++ b/luni/src/main/java/javax/sql/RowSetReader.java
diff --git a/sql/src/main/java/javax/sql/RowSetWriter.java b/luni/src/main/java/javax/sql/RowSetWriter.java
index 8e56d50..8e56d50 100644
--- a/sql/src/main/java/javax/sql/RowSetWriter.java
+++ b/luni/src/main/java/javax/sql/RowSetWriter.java
diff --git a/sql/src/main/java/javax/sql/package.html b/luni/src/main/java/javax/sql/package.html
index 7fdf1ce..7fdf1ce 100644
--- a/sql/src/main/java/javax/sql/package.html
+++ b/luni/src/main/java/javax/sql/package.html
diff --git a/archive/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java
index f4f32e1..f4f32e1 100644
--- a/archive/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/archive/internal/nls/Messages.java
diff --git a/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties b/luni/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
index 631101f..631101f 100644
--- a/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
+++ b/luni/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
diff --git a/archive/src/main/java/org/apache/harmony/archive/util/Util.java b/luni/src/main/java/org/apache/harmony/archive/util/Util.java
index 2ac4e90..2ac4e90 100644
--- a/archive/src/main/java/org/apache/harmony/archive/util/Util.java
+++ b/luni/src/main/java/org/apache/harmony/archive/util/Util.java
diff --git a/auth/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java
index 511aa7a..511aa7a 100644
--- a/auth/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/auth/internal/nls/Messages.java
diff --git a/auth/src/main/java/org/apache/harmony/auth/internal/nls/messages.properties b/luni/src/main/java/org/apache/harmony/auth/internal/nls/messages.properties
index c8d1b0f..c8d1b0f 100644
--- a/auth/src/main/java/org/apache/harmony/auth/internal/nls/messages.properties
+++ b/luni/src/main/java/org/apache/harmony/auth/internal/nls/messages.properties
diff --git a/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java b/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
index d6b2619..d6b2619 100644
--- a/crypto/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
+++ b/luni/src/main/java/org/apache/harmony/crypto/internal/NullCipherSpi.java
diff --git a/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java
index b61a5cf..b61a5cf 100644
--- a/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/crypto/internal/nls/Messages.java
diff --git a/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties b/luni/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties
index 509e100..509e100 100644
--- a/crypto/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties
+++ b/luni/src/main/java/org/apache/harmony/crypto/internal/nls/messages.properties
diff --git a/security/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java b/luni/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java
index afab96e..afab96e 100644
--- a/security/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java
+++ b/luni/src/main/java/org/apache/harmony/security/DefaultPolicyScanner.java
diff --git a/security/src/main/java/org/apache/harmony/security/PolicyEntry.java b/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
index 0037ad6..0037ad6 100644
--- a/security/src/main/java/org/apache/harmony/security/PolicyEntry.java
+++ b/luni/src/main/java/org/apache/harmony/security/PolicyEntry.java
diff --git a/security/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java
index a04ced0..a04ced0 100644
--- a/security/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/PrivateKeyImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/PublicKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/PublicKeyImpl.java
index 15196ae..15196ae 100644
--- a/security/src/main/java/org/apache/harmony/security/PublicKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/PublicKeyImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/SystemScope.java b/luni/src/main/java/org/apache/harmony/security/SystemScope.java
index 7acfe15..7acfe15 100644
--- a/security/src/main/java/org/apache/harmony/security/SystemScope.java
+++ b/luni/src/main/java/org/apache/harmony/security/SystemScope.java
diff --git a/security/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java b/luni/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java
index f270baf..f270baf 100644
--- a/security/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java
+++ b/luni/src/main/java/org/apache/harmony/security/UnresolvedPrincipal.java
diff --git a/security/src/main/java/org/apache/harmony/security/Util.java b/luni/src/main/java/org/apache/harmony/security/Util.java
index e6e764f..e6e764f 100644
--- a/security/src/main/java/org/apache/harmony/security/Util.java
+++ b/luni/src/main/java/org/apache/harmony/security/Util.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java
index 61bec47..61bec47 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Any.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java
index e31b99e..e31b99e 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1BitString.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java
index d40c2bf..d40c2bf 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Boolean.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java
index e8db789..e8db789 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Choice.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java
index 99cd3b6..99cd3b6 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constants.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java
index aba9b32..aba9b32 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Constructured.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java
index 5fa02f5..5fa02f5 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Enumerated.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java
index f214f26..f214f26 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Exception.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java
index fc42f61..fc42f61 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Explicit.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
index 4908afb..4908afb 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java
index df7d395..df7d395 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Implicit.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java
index 95a2128..95a2128 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Integer.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java
index 90abd39..90abd39 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OctetString.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java
index 960dc0f..960dc0f 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Oid.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
index 0f8d9f6..0f8d9f6 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1OpenType.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java
index 027c636..027c636 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Primitive.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java
index dbb59bf..dbb59bf 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Sequence.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java
index b9f1735..b9f1735 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SequenceOf.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java
index 5388434..5388434 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Set.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java
index b60c993..b60c993 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1SetOf.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java
index 0bc4b8a..0bc4b8a 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1StringType.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java
index 6fd930f..6fd930f 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Time.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java
index 8906bb7..8906bb7 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1Type.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java
index acb5f04..acb5f04 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1TypeCollection.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java
index 3d2cb3e..3d2cb3e 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1UTCTime.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java
index ebcfbce..ebcfbce 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ASN1ValueCollection.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java
index 531d760..531d760 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/BerInputStream.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java
index eb018fd..eb018fd 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/BerOutputStream.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/BitString.java b/luni/src/main/java/org/apache/harmony/security/asn1/BitString.java
index f0f4098..f0f4098 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/BitString.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/BitString.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java
index 01226b6..01226b6 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/DerInputStream.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java b/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java
index eb78d2c..eb78d2c 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/DerOutputStream.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java b/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
index 06ada53..06ada53 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/InformationObjectSet.java
diff --git a/security/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java b/luni/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java
index 0d3a77a..0d3a77a 100644
--- a/security/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/asn1/ObjectIdentifier.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
index df425a4..df425a4 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicy.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
index 8edb0c5..8edb0c5 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/DefaultPolicyParser.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/Engine.java b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
index 19fed41..19fed41 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/Engine.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/Engine.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java b/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
index b4e0e6a..b4e0e6a 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/PolicyUtils.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java
index 7f5055a..7f5055a 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityAccess.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java
index 64c7700..64c7700 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/SecurityUtils.java
diff --git a/security/src/main/java/org/apache/harmony/security/fortress/Services.java b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
index 60d9edd..60d9edd 100644
--- a/security/src/main/java/org/apache/harmony/security/fortress/Services.java
+++ b/luni/src/main/java/org/apache/harmony/security/fortress/Services.java
diff --git a/security/src/main/java/org/apache/harmony/security/internal/nls/Messages.java b/luni/src/main/java/org/apache/harmony/security/internal/nls/Messages.java
index d78d0df..d78d0df 100644
--- a/security/src/main/java/org/apache/harmony/security/internal/nls/Messages.java
+++ b/luni/src/main/java/org/apache/harmony/security/internal/nls/Messages.java
diff --git a/security/src/main/java/org/apache/harmony/security/internal/nls/messages.properties b/luni/src/main/java/org/apache/harmony/security/internal/nls/messages.properties
index 7fb0b4b..7fb0b4b 100644
--- a/security/src/main/java/org/apache/harmony/security/internal/nls/messages.properties
+++ b/luni/src/main/java/org/apache/harmony/security/internal/nls/messages.properties
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java
index 84c6734..84c6734 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequest.java
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
index 2f31131..2f31131 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs10/CertificationRequestInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
index b52483f..b52483f 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/AuthenticatedAttributes.java
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
index 2c129e2..2c129e2 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/ContentInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
index 2f9e99d..2f9e99d 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignedData.java
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
index 9235577..9235577 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs7/SignerInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java b/luni/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java
index 57afbc0..57afbc0 100644
--- a/security/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/pkcs8/PrivateKeyInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/Cache.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/Cache.java
index a4b5700..a4b5700 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/Cache.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/Cache.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java
index 2d75a5a..2d75a5a 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/DRLCertFactory.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
index 5902489..5902489 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLEntryImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
index 7414e75..7414e75 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CRLImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
index cc175df..cc175df 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertFactoryImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
index d3b4563..d3b4563 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
index 83b9944..83b9944 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertPathImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
index 80b674b..80b674b 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/CryptoProvider.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
index 42d3043..42d3043 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAKeyFactoryImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
index 291d69e..291d69e 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPrivateKeyImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
index f4bb13d..f4bb13d 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/DSAPublicKeyImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
index e3fde7f..e3fde7f 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/RandomBitsSupplier.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java
index 71c0384..71c0384 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1Impl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
index cd926d8..cd926d8 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1PRNG_SecureRandomImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java
index 7294361..7294361 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_Data.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
index dd59514..dd59514 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1_MessageDigestImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
index b7b9c98..b7b9c98 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/SHA1withDSA_SignatureImpl.java
diff --git a/security/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java b/luni/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java
index 41eeb45..41eeb45 100644
--- a/security/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/crypto/ThreeIntegerSequence.java
diff --git a/security/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java b/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
index bc84c01..bc84c01 100644
--- a/security/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/AlgNameMapper.java
diff --git a/security/src/main/java/org/apache/harmony/security/utils/Array.java b/luni/src/main/java/org/apache/harmony/security/utils/Array.java
index dc74202..dc74202 100644
--- a/security/src/main/java/org/apache/harmony/security/utils/Array.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/Array.java
diff --git a/security/src/main/java/org/apache/harmony/security/utils/JarUtils.java b/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java
index e19e14a..e19e14a 100644
--- a/security/src/main/java/org/apache/harmony/security/utils/JarUtils.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/JarUtils.java
diff --git a/security/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java b/luni/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java
index 2a19656..2a19656 100644
--- a/security/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/utils/ObjectIdentifier.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/AttributeType.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeType.java
index a730e4f..a730e4f 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/AttributeType.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeType.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
index 63434893..63434893 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValue.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
index 30d71e7..30d71e7 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeTypeAndValueComparator.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/AttributeValue.java b/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
index 0844c5e..0844c5e 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/AttributeValue.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/Attributes.java b/luni/src/main/java/org/apache/harmony/security/x501/Attributes.java
index 38c6f4f..38c6f4f 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/Attributes.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/Attributes.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/DirectoryString.java b/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
index aafb8b5..aafb8b5 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/DirectoryString.java
diff --git a/security/src/main/java/org/apache/harmony/security/x501/Name.java b/luni/src/main/java/org/apache/harmony/security/x501/Name.java
index ae08671..ae08671 100644
--- a/security/src/main/java/org/apache/harmony/security/x501/Name.java
+++ b/luni/src/main/java/org/apache/harmony/security/x501/Name.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/AccessDescription.java b/luni/src/main/java/org/apache/harmony/security/x509/AccessDescription.java
index 69b9258..69b9258 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/AccessDescription.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AccessDescription.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
index 728fd6a..728fd6a 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AlgorithmIdentifier.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/AlternativeName.java b/luni/src/main/java/org/apache/harmony/security/x509/AlternativeName.java
index fd055c7..fd055c7 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/AlternativeName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AlternativeName.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
index 3de59fb..3de59fb 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/AuthorityKeyIdentifier.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
index edbf13e..edbf13e 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/BasicConstraints.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java b/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
index eb73e61..eb73e61 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CRLDistributionPoints.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/CRLNumber.java b/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
index db2480e..db2480e 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CRLNumber.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/Certificate.java b/luni/src/main/java/org/apache/harmony/security/x509/Certificate.java
index 27e8dfc..27e8dfc 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/Certificate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Certificate.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
index d6ab760..d6ab760 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificateIssuer.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/CertificateList.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificateList.java
index 5715a72..5715a72 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/CertificateList.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificateList.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java b/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
index 0c2267b..0c2267b 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/CertificatePolicies.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/DNParser.java b/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
index 5870bcd..5870bcd 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/DNParser.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DNParser.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
index 5751ca2..5751ca2 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPoint.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
index c7d8ffa..c7d8ffa 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/DistributionPointName.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java b/luni/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java
index f5976c0..f5976c0 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/EDIPartyName.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java b/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
index 4eacbd5..4eacbd5 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ExtendedKeyUsage.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/Extension.java b/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
index 86e7a45..86e7a45 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/Extension.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Extension.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java b/luni/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java
index afd9f93..afd9f93 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ExtensionValue.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/Extensions.java b/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
index 1fee6c0..1fee6c0 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/Extensions.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Extensions.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/GeneralName.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
index dcf4b94..dcf4b94 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/GeneralName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralName.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/GeneralNames.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
index 0ad78df..0ad78df 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralNames.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java
index 155d1e7..155d1e7 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtree.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
index 1f87f9a..1f87f9a 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/GeneralSubtrees.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java b/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
index ce5404e..ce5404e 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InfoAccessSyntax.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java b/luni/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java
index 724a76b..724a76b 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InhibitAnyPolicy.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java b/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
index b01fa45..b01fa45 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/InvalidityDate.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java b/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
index 102fe05..102fe05 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/IssuingDistributionPoint.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/KeyUsage.java b/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
index e8983de..e8983de 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/KeyUsage.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/NameConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
index 2c347e8..2c347e8 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/NameConstraints.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/ORAddress.java b/luni/src/main/java/org/apache/harmony/security/x509/ORAddress.java
index 0e3bf98..0e3bf98 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/ORAddress.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ORAddress.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/OtherName.java b/luni/src/main/java/org/apache/harmony/security/x509/OtherName.java
index 150e81e..150e81e 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/OtherName.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/OtherName.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
index 7a6f54b..7a6f54b 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyConstraints.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java
index bb51e29..bb51e29 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyInformation.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java
index 1cc672a..1cc672a 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PolicyQualifierInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java b/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
index 417479a..417479a 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/PrivateKeyUsagePeriod.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/ReasonCode.java b/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
index de3505d..de3505d 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ReasonCode.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java b/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
index 842784f..842784f 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/ReasonFlags.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java b/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
index 4437b29..4437b29 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/SubjectKeyIdentifier.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
index 852b3ce..852b3ce 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/SubjectPublicKeyInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/TBSCertList.java b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
index 6b04d55..6b04d55 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertList.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
index aaafe3a..aaafe3a 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/TBSCertificate.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/Time.java b/luni/src/main/java/org/apache/harmony/security/x509/Time.java
index 912e014..912e014 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/Time.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Time.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/Utils.java b/luni/src/main/java/org/apache/harmony/security/x509/Utils.java
index 8c72710..8c72710 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/Utils.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Utils.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/Validity.java b/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
index e5d9c19..e5d9c19 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/Validity.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/Validity.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java b/luni/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java
index cae6b97..cae6b97 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/X509PublicKey.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java
index cf17ce1..cf17ce1 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/MessageImprint.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java
index 702513c..702513c 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIFailureInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java
index afe58b1..afe58b1 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatus.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
index b0b75a6..b0b75a6 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/PKIStatusInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
index f2aa0ee..f2aa0ee 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TSTInfo.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
index 5e4e6ff..5e4e6ff 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampReq.java
diff --git a/security/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java
index af03ea5..af03ea5 100644
--- a/security/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java
+++ b/luni/src/main/java/org/apache/harmony/security/x509/tsp/TimeStampResp.java
diff --git a/text/src/main/java/org/apache/harmony/text/BidiRun.java b/luni/src/main/java/org/apache/harmony/text/BidiRun.java
index d1033f4..d1033f4 100644
--- a/text/src/main/java/org/apache/harmony/text/BidiRun.java
+++ b/luni/src/main/java/org/apache/harmony/text/BidiRun.java
diff --git a/text/src/main/java/org/apache/harmony/text/BidiWrapper.java b/luni/src/main/java/org/apache/harmony/text/BidiWrapper.java
index f9dc8da..f9dc8da 100644
--- a/text/src/main/java/org/apache/harmony/text/BidiWrapper.java
+++ b/luni/src/main/java/org/apache/harmony/text/BidiWrapper.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1Choice.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1Choice.java
index 603131d..603131d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1Choice.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1Choice.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1Collection.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1Collection.java
index a51dda1..a51dda1 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1Collection.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1Collection.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java
index 2b993c5..2b993c5 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1Encodable.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java
index d74e56b..d74e56b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1EncodableVector.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java
index 03f06fe..03f06fe 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1InputStream.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1Null.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1Null.java
index dcb823d..dcb823d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1Null.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1Null.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java
index a65d268..a65d268 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1OctetString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
index 5897d09..5897d09 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1OutputStream.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java
index 400b1dc..400b1dc 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1Sequence.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1Set.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1Set.java
index 9e6c55f..9e6c55f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1Set.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1Set.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java b/luni/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java
index 5d6a2a4..5d6a2a4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ASN1TaggedObject.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java b/luni/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java
index c9518a6..c9518a6 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERConstructedOctetString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERConstructedSequence.java b/luni/src/main/java/org/bouncycastle/asn1/BERConstructedSequence.java
index 998eaeb..998eaeb 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERConstructedSequence.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERConstructedSequence.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERInputStream.java b/luni/src/main/java/org/bouncycastle/asn1/BERInputStream.java
index 088f915..088f915 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERInputStream.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERInputStream.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERNull.java b/luni/src/main/java/org/bouncycastle/asn1/BERNull.java
index 697dd4b..697dd4b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERNull.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERNull.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BEROutputStream.java b/luni/src/main/java/org/bouncycastle/asn1/BEROutputStream.java
index c2e8da4..c2e8da4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BEROutputStream.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BEROutputStream.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERSequence.java b/luni/src/main/java/org/bouncycastle/asn1/BERSequence.java
index c389fa8..c389fa8 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERSequence.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERSequence.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERSet.java b/luni/src/main/java/org/bouncycastle/asn1/BERSet.java
index 1ccf0fd..1ccf0fd 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERSet.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERSet.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java b/luni/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java
index 2e06c40..2e06c40 100644
--- a/security/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/BERTaggedObject.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java b/luni/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java
index ad4f9ed..ad4f9ed 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERApplicationSpecific.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERBMPString.java b/luni/src/main/java/org/bouncycastle/asn1/DERBMPString.java
index 77ed252..77ed252 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERBMPString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERBMPString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERBitString.java b/luni/src/main/java/org/bouncycastle/asn1/DERBitString.java
index 367a297..367a297 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERBitString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERBitString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERBoolean.java b/luni/src/main/java/org/bouncycastle/asn1/DERBoolean.java
index 2aa93f1..2aa93f1 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERBoolean.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERBoolean.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERConstructedSequence.java b/luni/src/main/java/org/bouncycastle/asn1/DERConstructedSequence.java
index 99a493e..99a493e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERConstructedSequence.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERConstructedSequence.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERConstructedSet.java b/luni/src/main/java/org/bouncycastle/asn1/DERConstructedSet.java
index 695cef3..695cef3 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERConstructedSet.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERConstructedSet.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DEREncodable.java b/luni/src/main/java/org/bouncycastle/asn1/DEREncodable.java
index d89305a..d89305a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DEREncodable.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DEREncodable.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java b/luni/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java
index 49f3a17..49f3a17 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DEREncodableVector.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DEREnumerated.java b/luni/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
index 170fd97..170fd97 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DEREnumerated.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERGeneralString.java b/luni/src/main/java/org/bouncycastle/asn1/DERGeneralString.java
index c93fe96..c93fe96 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERGeneralString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERGeneralString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java b/luni/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java
index c70574b..c70574b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERGeneralizedTime.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERIA5String.java b/luni/src/main/java/org/bouncycastle/asn1/DERIA5String.java
index a75ab1e..a75ab1e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERIA5String.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERIA5String.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERInputStream.java b/luni/src/main/java/org/bouncycastle/asn1/DERInputStream.java
index 37763e4..37763e4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERInputStream.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERInputStream.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERInteger.java b/luni/src/main/java/org/bouncycastle/asn1/DERInteger.java
index e80d895..e80d895 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERInteger.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERInteger.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERNull.java b/luni/src/main/java/org/bouncycastle/asn1/DERNull.java
index 2be5c80..2be5c80 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERNull.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERNull.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERNumericString.java b/luni/src/main/java/org/bouncycastle/asn1/DERNumericString.java
index b53716a..b53716a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERNumericString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERNumericString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERObject.java b/luni/src/main/java/org/bouncycastle/asn1/DERObject.java
index 42e2487..42e2487 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERObject.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERObject.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
index 190d727..190d727 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERObjectIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DEROctetString.java b/luni/src/main/java/org/bouncycastle/asn1/DEROctetString.java
index bf7a86b..bf7a86b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DEROctetString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DEROctetString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DEROutputStream.java b/luni/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
index f55142c..f55142c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DEROutputStream.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERPrintableString.java b/luni/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
index 00aec9b..00aec9b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERSequence.java b/luni/src/main/java/org/bouncycastle/asn1/DERSequence.java
index 1cfd38d..1cfd38d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERSequence.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERSequence.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERSet.java b/luni/src/main/java/org/bouncycastle/asn1/DERSet.java
index e1aa1d5..e1aa1d5 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERSet.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERSet.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERString.java b/luni/src/main/java/org/bouncycastle/asn1/DERString.java
index 3143be9..3143be9 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERT61String.java b/luni/src/main/java/org/bouncycastle/asn1/DERT61String.java
index 8c7c99a..8c7c99a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERT61String.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERT61String.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java b/luni/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java
index d42f0d6..d42f0d6 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERTaggedObject.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERTags.java b/luni/src/main/java/org/bouncycastle/asn1/DERTags.java
index ef441ef..ef441ef 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERTags.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERTags.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERUTCTime.java b/luni/src/main/java/org/bouncycastle/asn1/DERUTCTime.java
index a6d0cc7..a6d0cc7 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERUTCTime.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERUTCTime.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERUTF8String.java b/luni/src/main/java/org/bouncycastle/asn1/DERUTF8String.java
index 1402d38..1402d38 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERUTF8String.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERUTF8String.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERUniversalString.java b/luni/src/main/java/org/bouncycastle/asn1/DERUniversalString.java
index ec8c519..ec8c519 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERUniversalString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERUniversalString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERUnknownTag.java b/luni/src/main/java/org/bouncycastle/asn1/DERUnknownTag.java
index 8b0631c..8b0631c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERUnknownTag.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERUnknownTag.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/DERVisibleString.java b/luni/src/main/java/org/bouncycastle/asn1/DERVisibleString.java
index 1660eb2..1660eb2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/DERVisibleString.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/DERVisibleString.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java b/luni/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java
index 5467944..5467944 100644
--- a/security/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/OIDTokenizer.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/OrderedTable.java b/luni/src/main/java/org/bouncycastle/asn1/OrderedTable.java
index 511aba2..511aba2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/OrderedTable.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/OrderedTable.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java
index 5d97e0a..5d97e0a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java
index f821071..f821071 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java
index 58b2b69..58b2b69 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java
index b4f37cc..b4f37cc 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/Attribute.java b/luni/src/main/java/org/bouncycastle/asn1/cms/Attribute.java
index dbec62e..dbec62e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/Attribute.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/Attribute.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java b/luni/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java
index 9b4d79f..9b4d79f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/AttributeTable.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/CMSAttributes.java b/luni/src/main/java/org/bouncycastle/asn1/cms/CMSAttributes.java
index bdcca6a..bdcca6a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/CMSAttributes.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/CMSAttributes.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/CMSObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/cms/CMSObjectIdentifiers.java
index 2e6b312..2e6b312 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/CMSObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/CMSObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java b/luni/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java
index 2331059..2331059 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
index 76801a3..76801a3 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java
index 22ac839..22ac839 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java b/luni/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java
index f4ac42c..f4ac42c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/IssuerAndSerialNumber.java b/luni/src/main/java/org/bouncycastle/asn1/cms/IssuerAndSerialNumber.java
index f02b1aa..f02b1aa 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/IssuerAndSerialNumber.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/IssuerAndSerialNumber.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java
index 708487e..708487e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java
index ddbcf13..ddbcf13 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java
index 5ebf4dc..5ebf4dc 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java
index 70553b7..70553b7 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java b/luni/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java
index f9d3c21..f9d3c21 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java
index 50d2edc..50d2edc 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java b/luni/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java
index 826761d..826761d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java b/luni/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java
index 1232363..1232363 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java
index e70c43c..e70c43c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java
index 555a820..555a820 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java
index 2578583..2578583 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
index 13f98f2..13f98f2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java
index f7e3b19..f7e3b19 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/SignedData.java b/luni/src/main/java/org/bouncycastle/asn1/cms/SignedData.java
index 434395c..434395c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/SignedData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/SignedData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java
index 41b8c57..41b8c57 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/SignerIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/SignerInfo.java b/luni/src/main/java/org/bouncycastle/asn1/cms/SignerInfo.java
index 83a1f53..83a1f53 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/SignerInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/SignerInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cms/Time.java b/luni/src/main/java/org/bouncycastle/asn1/cms/Time.java
index 6b8817c..6b8817c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cms/Time.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cms/Time.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java
index b5d6c1f..b5d6c1f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java
index 90e90d4..90e90d4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java b/luni/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java
index 76616ea..76616ea 100644
--- a/security/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java b/luni/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java
index 7895e76..7895e76 100644
--- a/security/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java b/luni/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java
index 6d652e0..6d652e0 100644
--- a/security/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java b/luni/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java
index 49bd819..49bd819 100644
--- a/security/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java
index 88b4f45..88b4f45 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java b/luni/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java
index 69b107a..69b107a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java b/luni/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java
index dcd5d50..dcd5d50 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java b/luni/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java
index 4bc12a4..4bc12a4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java b/luni/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java
index bd3c904..bd3c904 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java
index d375f90..d375f90 100644
--- a/security/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/iana/IANAObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/iana/IANAObjectIdentifiers.java
index 6faa597..6faa597 100644
--- a/security/src/main/java/org/bouncycastle/asn1/iana/IANAObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/iana/IANAObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java b/luni/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java
index 3413126..3413126 100644
--- a/security/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java
index 957993a..957993a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java b/luni/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java
index 177fdcf..177fdcf 100644
--- a/security/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java b/luni/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java
index c384e8a..c384e8a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/misc/MiscObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/misc/MiscObjectIdentifiers.java
index b2d46e2..b2d46e2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/misc/MiscObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/misc/MiscObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/misc/NetscapeCertType.java b/luni/src/main/java/org/bouncycastle/asn1/misc/NetscapeCertType.java
index 61a851a..61a851a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/misc/NetscapeCertType.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/misc/NetscapeCertType.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/misc/NetscapeRevocationURL.java b/luni/src/main/java/org/bouncycastle/asn1/misc/NetscapeRevocationURL.java
index ba35d08..ba35d08 100644
--- a/security/src/main/java/org/bouncycastle/asn1/misc/NetscapeRevocationURL.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/misc/NetscapeRevocationURL.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/misc/VerisignCzagExtension.java b/luni/src/main/java/org/bouncycastle/asn1/misc/VerisignCzagExtension.java
index 5066ec5..5066ec5 100644
--- a/security/src/main/java/org/bouncycastle/asn1/misc/VerisignCzagExtension.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/misc/VerisignCzagExtension.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java b/luni/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java
index 57df8b0..57df8b0 100644
--- a/security/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java
index e4a2777..e4a2777 100644
--- a/security/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/nist/NISTObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java
index c78e193..c78e193 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java
index 2f5fe85..2f5fe85 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java
index 1868bfc..1868bfc 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java
index c933ac0..c933ac0 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java
index f247270..f247270 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java
index 3f379de..3f379de 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java
index 9fbf740..9fbf740 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java
index 7185235..7185235 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/Request.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/Request.java
index 350fa17..350fa17 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/Request.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/Request.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java
index 09cdf11..09cdf11 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java
index 997f41f..997f41f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java
index db0e586..db0e586 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java
index 501a117..501a117 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java
index 296dd53..296dd53 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java
index 907fd9b..907fd9b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java
index a16f14b..a16f14b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java b/luni/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java
index fd4e86b..fd4e86b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java
index 4174e4d..4174e4d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/oiw/OIWObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
index 56d6870..56d6870 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java
index fe04a5c..fe04a5c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/AuthenticatedSafe.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java
index c781b4c..c781b4c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/CertBag.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequest.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequest.java
index ba28f54..ba28f54 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequest.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequest.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java
index 3b9314d..3b9314d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/CertificationRequestInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java
index 49b3a70..49b3a70 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/ContentInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java
index 34537fa..34537fa 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/DHParameter.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedData.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedData.java
index 37d1303..37d1303 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java
index b46c13f..b46c13f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/EncryptedPrivateKeyInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java
index eb9b326..eb9b326 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/EncryptionScheme.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java
index 088d213..088d213 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/IssuerAndSerialNumber.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java
index 50c9ef2..50c9ef2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/KeyDerivationFunc.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java
index 8f58c82..8f58c82 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java
index 2817903..2817903 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Algorithms.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Parameters.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Parameters.java
index 57c773c..57c773c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Parameters.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PBES2Parameters.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java
index 311766e..311766e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PBKDF2Params.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java
index 5dc3a5d..5dc3a5d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PKCS12PBEParams.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
index 1a7a553..1a7a553 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/Pfx.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/Pfx.java
index ba5292c..ba5292c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/Pfx.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/Pfx.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java
index 5c384d8..5c384d8 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
index 23508a4..23508a4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java
index 87537ff..87537ff 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RSAESOAEPparams.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java
index 998b7c6..998b7c6 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RSAPrivateKeyStructure.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java
index 684aabd..684aabd 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/RSASSAPSSparams.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java
index 2808d92..2808d92 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/SafeBag.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java
index 136ad11..136ad11 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/SignedData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java b/luni/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java
index 8e4ccbb..8e4ccbb 100644
--- a/security/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTObjectIdentifiers.java
index 58098e1..58098e1 100644
--- a/security/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java b/luni/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java
index 18f4c15..18f4c15 100644
--- a/security/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java b/luni/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java
index 46b8dc1..46b8dc1 100644
--- a/security/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java b/luni/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java
index e81ea3a..e81ea3a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java b/luni/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java
index 46565e7..46565e7 100644
--- a/security/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java b/luni/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java
index f5bfa7e..f5bfa7e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java b/luni/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
index 97dca60..97dca60 100644
--- a/security/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/util/ASN1Dump.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/util/DERDump.java b/luni/src/main/java/org/bouncycastle/asn1/util/DERDump.java
index e9d307a..e9d307a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/util/DERDump.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/util/DERDump.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/util/Dump.java b/luni/src/main/java/org/bouncycastle/asn1/util/Dump.java
index 27a37f3..27a37f3 100644
--- a/security/src/main/java/org/bouncycastle/asn1/util/Dump.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/util/Dump.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java
index ae13f55..ae13f55 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
index 501dc9c..501dc9c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AttCertIssuer.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AttCertIssuer.java
index c973b37..c973b37 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AttCertIssuer.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AttCertIssuer.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java
index de4e684..de4e684 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AttCertValidityPeriod.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/Attribute.java b/luni/src/main/java/org/bouncycastle/asn1/x509/Attribute.java
index c8cbcf7..c8cbcf7 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/Attribute.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/Attribute.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificate.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificate.java
index 6dcb7c6..6dcb7c6 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificate.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificate.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java
index 74770f5..74770f5 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AttributeCertificateInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java
index 9f34436..9f34436 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java
index 2e5107b..2e5107b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java b/luni/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java
index c97b6cd..c97b6cd 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/BasicConstraints.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java b/luni/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java
index ed8ab58..ed8ab58 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/CRLDistPoint.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/CRLNumber.java b/luni/src/main/java/org/bouncycastle/asn1/x509/CRLNumber.java
index e488086..e488086 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/CRLNumber.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/CRLNumber.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/CRLReason.java b/luni/src/main/java/org/bouncycastle/asn1/x509/CRLReason.java
index 265c662..265c662 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/CRLReason.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/CRLReason.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java b/luni/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java
index 3e85dbd..3e85dbd 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java b/luni/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java
index c7f890b..c7f890b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/CertificateList.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java b/luni/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java
index b59e08e..b59e08e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/DSAParameter.java b/luni/src/main/java/org/bouncycastle/asn1/x509/DSAParameter.java
index 50822d6..50822d6 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/DSAParameter.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/DSAParameter.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/DigestInfo.java b/luni/src/main/java/org/bouncycastle/asn1/x509/DigestInfo.java
index 882e71e..882e71e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/DigestInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/DigestInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java b/luni/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java
index 90b025e..90b025e 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/DistributionPoint.java b/luni/src/main/java/org/bouncycastle/asn1/x509/DistributionPoint.java
index ea5aa0b..ea5aa0b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/DistributionPoint.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/DistributionPoint.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/DistributionPointName.java b/luni/src/main/java/org/bouncycastle/asn1/x509/DistributionPointName.java
index 91ef110..91ef110 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/DistributionPointName.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/DistributionPointName.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java b/luni/src/main/java/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java
index a84b97f..a84b97f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/ExtendedKeyUsage.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/GeneralName.java b/luni/src/main/java/org/bouncycastle/asn1/x509/GeneralName.java
index e015cee..e015cee 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/GeneralName.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/GeneralName.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/GeneralNames.java b/luni/src/main/java/org/bouncycastle/asn1/x509/GeneralNames.java
index d2f8d7d..d2f8d7d 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/GeneralNames.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/GeneralNames.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/GeneralSubtree.java b/luni/src/main/java/org/bouncycastle/asn1/x509/GeneralSubtree.java
index e3e4240..e3e4240 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/GeneralSubtree.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/GeneralSubtree.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/Holder.java b/luni/src/main/java/org/bouncycastle/asn1/x509/Holder.java
index 8b9a08c..8b9a08c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/Holder.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/Holder.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java b/luni/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java
index 07e07cf..07e07cf 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/IssuerSerial.java b/luni/src/main/java/org/bouncycastle/asn1/x509/IssuerSerial.java
index ceb639f..ceb639f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/IssuerSerial.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/IssuerSerial.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java b/luni/src/main/java/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java
index 07e468f..07e468f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/IssuingDistributionPoint.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/KeyPurposeId.java b/luni/src/main/java/org/bouncycastle/asn1/x509/KeyPurposeId.java
index b247e09..b247e09 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/KeyPurposeId.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/KeyPurposeId.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/KeyUsage.java b/luni/src/main/java/org/bouncycastle/asn1/x509/KeyUsage.java
index e56424f..e56424f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/KeyUsage.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/KeyUsage.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/NameConstraints.java b/luni/src/main/java/org/bouncycastle/asn1/x509/NameConstraints.java
index 1383d39..1383d39 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/NameConstraints.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/NameConstraints.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java b/luni/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java
index 0bc639a..0bc639a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/ObjectDigestInfo.java b/luni/src/main/java/org/bouncycastle/asn1/x509/ObjectDigestInfo.java
index 048922b..048922b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/ObjectDigestInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/ObjectDigestInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyInformation.java b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyInformation.java
index b4373b0..b4373b0 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyInformation.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyInformation.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java
index df78ec4..df78ec4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java
index 2678057..2678057 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java
index 6e97f70..6e97f70 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java b/luni/src/main/java/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java
index 0047f6a..0047f6a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/RSAPublicKeyStructure.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/ReasonFlags.java b/luni/src/main/java/org/bouncycastle/asn1/x509/ReasonFlags.java
index 612e2c5..612e2c5 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/ReasonFlags.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/ReasonFlags.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java b/luni/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java
index fe227d9..fe227d9 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java b/luni/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java
index 3dede65..3dede65 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java b/luni/src/main/java/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java
index ca7ad42..ca7ad42 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/SubjectKeyIdentifier.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java b/luni/src/main/java/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java
index a733727..a733727 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/TBSCertList.java b/luni/src/main/java/org/bouncycastle/asn1/x509/TBSCertList.java
index 6c5afd8..6c5afd8 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/TBSCertList.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/TBSCertList.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/TBSCertificateStructure.java b/luni/src/main/java/org/bouncycastle/asn1/x509/TBSCertificateStructure.java
index cc3c0e4..cc3c0e4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/TBSCertificateStructure.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/TBSCertificateStructure.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/Time.java b/luni/src/main/java/org/bouncycastle/asn1/x509/Time.java
index 7662ee4..7662ee4 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/Time.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/Time.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java b/luni/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java
index b3785ff..b3785ff 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java b/luni/src/main/java/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java
index 53505d1..53505d1 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/V1TBSCertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java b/luni/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java
index 5931f77..5931f77 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/V2Form.java b/luni/src/main/java/org/bouncycastle/asn1/x509/V2Form.java
index 6a229dd..6a229dd 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/V2Form.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/V2Form.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java b/luni/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java
index f50a3b8..f50a3b8 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java b/luni/src/main/java/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java
index 149d680..149d680 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509Attributes.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Attributes.java
index 8ea18fa..8ea18fa 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509Attributes.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Attributes.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509CertificateStructure.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509CertificateStructure.java
index 599db32..599db32 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509CertificateStructure.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509CertificateStructure.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java
index a9402b6..a9402b6 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509DefaultEntryConverter.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java
index 19ff3f3..19ff3f3 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Extension.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java
index be1409b..be1409b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Extensions.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509Name.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Name.java
index 50b1a60..50b1a60 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509Name.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509Name.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameElementList.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509NameElementList.java
index 377fb8c..377fb8c 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameElementList.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509NameElementList.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameEntryConverter.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509NameEntryConverter.java
index 24075f7..24075f7 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameEntryConverter.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509NameEntryConverter.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
index 8f0d08b..8f0d08b 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java
index 1f8b8a2..1f8b8a2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/X509ObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java
index 9f373fa..9f373fa 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java
index eef97e3..eef97e3 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java
index 10ced50..10ced50 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java
index c8c0ce3..c8c0ce3 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java
index 6b87ea0..6b87ea0 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java
index 8762f2f..8762f2f 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java
index 445e8b2..445e8b2 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java
index 3ab384a..3ab384a 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java
index 73fc962..73fc962 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java b/luni/src/main/java/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java
index c313572..c313572 100644
--- a/security/src/main/java/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java
+++ b/luni/src/main/java/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/AsymmetricBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/AsymmetricBlockCipher.java
index 565effc..565effc 100644
--- a/security/src/main/java/org/bouncycastle/crypto/AsymmetricBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/AsymmetricBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java b/luni/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java
index 85bec73..85bec73 100644
--- a/security/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPair.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java
index 919db19..919db19 100644
--- a/security/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/AsymmetricCipherKeyPairGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/BasicAgreement.java b/luni/src/main/java/org/bouncycastle/crypto/BasicAgreement.java
index 4907427..4907427 100644
--- a/security/src/main/java/org/bouncycastle/crypto/BasicAgreement.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/BasicAgreement.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/BlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/BlockCipher.java
index 3cfa25a..3cfa25a 100644
--- a/security/src/main/java/org/bouncycastle/crypto/BlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/BlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java
index 205132e..205132e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java
index 53d776a..53d776a 100644
--- a/security/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/BufferedBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/CipherKeyGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/CipherKeyGenerator.java
index 451f8e8..451f8e8 100644
--- a/security/src/main/java/org/bouncycastle/crypto/CipherKeyGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/CipherKeyGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/CipherParameters.java b/luni/src/main/java/org/bouncycastle/crypto/CipherParameters.java
index 5be8730..5be8730 100644
--- a/security/src/main/java/org/bouncycastle/crypto/CipherParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/CipherParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/CryptoException.java b/luni/src/main/java/org/bouncycastle/crypto/CryptoException.java
index dc4a8df..dc4a8df 100644
--- a/security/src/main/java/org/bouncycastle/crypto/CryptoException.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/CryptoException.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/DSA.java b/luni/src/main/java/org/bouncycastle/crypto/DSA.java
index 1f58476..1f58476 100644
--- a/security/src/main/java/org/bouncycastle/crypto/DSA.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/DSA.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/DataLengthException.java b/luni/src/main/java/org/bouncycastle/crypto/DataLengthException.java
index fbf047c..fbf047c 100644
--- a/security/src/main/java/org/bouncycastle/crypto/DataLengthException.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/DataLengthException.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/DerivationFunction.java b/luni/src/main/java/org/bouncycastle/crypto/DerivationFunction.java
index ef6e29e..ef6e29e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/DerivationFunction.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/DerivationFunction.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/DerivationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/DerivationParameters.java
index e11eb86..e11eb86 100644
--- a/security/src/main/java/org/bouncycastle/crypto/DerivationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/DerivationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/Digest.java b/luni/src/main/java/org/bouncycastle/crypto/Digest.java
index f44fad0..f44fad0 100644
--- a/security/src/main/java/org/bouncycastle/crypto/Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java b/luni/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java
index c5e9e8b..c5e9e8b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/ExtendedDigest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java b/luni/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
index 59e4b26..59e4b26 100644
--- a/security/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/InvalidCipherTextException.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/KeyGenerationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/KeyGenerationParameters.java
index 9a63522..9a63522 100644
--- a/security/src/main/java/org/bouncycastle/crypto/KeyGenerationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/KeyGenerationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/Mac.java b/luni/src/main/java/org/bouncycastle/crypto/Mac.java
index 8c122c8..8c122c8 100644
--- a/security/src/main/java/org/bouncycastle/crypto/Mac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/Mac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
index aaa6015..aaa6015 100644
--- a/security/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java b/luni/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
index c157202..c157202 100644
--- a/security/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/RuntimeCryptoException.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/Signer.java b/luni/src/main/java/org/bouncycastle/crypto/Signer.java
index 357b0da..357b0da 100644
--- a/security/src/main/java/org/bouncycastle/crypto/Signer.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/Signer.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/SignerWithRecovery.java b/luni/src/main/java/org/bouncycastle/crypto/SignerWithRecovery.java
index 5a1e204..5a1e204 100644
--- a/security/src/main/java/org/bouncycastle/crypto/SignerWithRecovery.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/SignerWithRecovery.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
index 8fdd232..8fdd232 100644
--- a/security/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/StreamBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/StreamCipher.java b/luni/src/main/java/org/bouncycastle/crypto/StreamCipher.java
index afa6296..afa6296 100644
--- a/security/src/main/java/org/bouncycastle/crypto/StreamCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/StreamCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/Wrapper.java b/luni/src/main/java/org/bouncycastle/crypto/Wrapper.java
index 3956a6f..3956a6f 100644
--- a/security/src/main/java/org/bouncycastle/crypto/Wrapper.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/Wrapper.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java b/luni/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java
index 2b27feb..2b27feb 100644
--- a/security/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/agreement/DHBasicAgreement.java b/luni/src/main/java/org/bouncycastle/crypto/agreement/DHBasicAgreement.java
index 1a39de3..1a39de3 100644
--- a/security/src/main/java/org/bouncycastle/crypto/agreement/DHBasicAgreement.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/agreement/DHBasicAgreement.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java
index f2c9967..f2c9967 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/GeneralDigest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/LongDigest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/LongDigest.java
index 23af605..23af605 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/LongDigest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/LongDigest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java
index 2a8084f..2a8084f 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java
index 05ed27a..05ed27a 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/MD5Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java
index 9b282e9..9b282e9 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA1Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/SHA224Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA224Digest.java
index 392d12b..392d12b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/SHA224Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA224Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java
index d9cbc44..d9cbc44 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA256Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/SHA384Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA384Digest.java
index e2a9faa..e2a9faa 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/SHA384Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA384Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/SHA512Digest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA512Digest.java
index 1f4ae41..1f4ae41 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/SHA512Digest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/SHA512Digest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java b/luni/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java
index 89033e8..89033e8 100644
--- a/security/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java b/luni/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java
index 7e30023..7e30023 100644
--- a/security/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java b/luni/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java
index 11821a0..11821a0 100644
--- a/security/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java b/luni/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
index 09b32eb..09b32eb 100644
--- a/security/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
index 908e78f..908e78f 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/AESEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/AESFastEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/AESFastEngine.java
index e693a1b..e693a1b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/AESFastEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/AESFastEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java
index b0730e3..b0730e3 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/AESWrapEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/AESWrapEngine.java
index 6f10eff..6f10eff 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/AESWrapEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/AESWrapEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/DESEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/DESEngine.java
index b795a9e..b795a9e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/DESEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/DESEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/DESedeEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/DESedeEngine.java
index a340034..a340034 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/DESedeEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/DESedeEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
index e37244b..e37244b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java
index 723fd9a..723fd9a 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java
index 22544ac..22544ac 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/RC2Engine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/RC2Engine.java
index e5a9bb3..e5a9bb3 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/RC2Engine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/RC2Engine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java b/luni/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java
index a010b01..a010b01 100644
--- a/security/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java
index 268ae9b..268ae9b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DESKeyGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DESKeyGenerator.java
index bb3f6d0..bb3f6d0 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DESKeyGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DESKeyGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java
index 101dc37..101dc37 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DESedeKeyGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java
index 213c052..213c052 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DHBasicKeyPairGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java
index abbda43..abbda43 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DHKeyGeneratorHelper.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java
index 8c734cd..8c734cd 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DHParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DHParametersGenerator.java
index f3dff34..f3dff34 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DHParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DHParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java
index e1a9655..e1a9655 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DSAKeyPairGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java
index 4996b1e..4996b1e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java
index 7789b7b..7789b7b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java
index cab05ac..cab05ac 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java
index e93c0d7..e93c0d7 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
index 8a4d28a..8a4d28a 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
index bf2f368..bf2f368 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
index 1c62ecc..1c62ecc 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
index 9b4972d..9b4972d 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java b/luni/src/main/java/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java
index b881104..b881104 100644
--- a/security/src/main/java/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/generators/RSAKeyPairGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/io/DigestInputStream.java b/luni/src/main/java/org/bouncycastle/crypto/io/DigestInputStream.java
index ef0b03e..ef0b03e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/io/DigestInputStream.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/io/DigestInputStream.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/io/DigestOutputStream.java b/luni/src/main/java/org/bouncycastle/crypto/io/DigestOutputStream.java
index 2907954..2907954 100644
--- a/security/src/main/java/org/bouncycastle/crypto/io/DigestOutputStream.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/io/DigestOutputStream.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/io/MacInputStream.java b/luni/src/main/java/org/bouncycastle/crypto/io/MacInputStream.java
index b78548c..b78548c 100644
--- a/security/src/main/java/org/bouncycastle/crypto/io/MacInputStream.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/io/MacInputStream.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/io/MacOutputStream.java b/luni/src/main/java/org/bouncycastle/crypto/io/MacOutputStream.java
index 2cac1c3..2cac1c3 100644
--- a/security/src/main/java/org/bouncycastle/crypto/io/MacOutputStream.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/io/MacOutputStream.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java b/luni/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java
index b0f3c0b..b0f3c0b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java b/luni/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
index e283df2..e283df2 100644
--- a/security/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/macs/CBCBlockCipherMac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java b/luni/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java
index 1a0395e..1a0395e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/HMac.java b/luni/src/main/java/org/bouncycastle/crypto/macs/HMac.java
index 7272f32..7272f32 100644
--- a/security/src/main/java/org/bouncycastle/crypto/macs/HMac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/macs/HMac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java b/luni/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java
index 11db130..11db130 100644
--- a/security/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java b/luni/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java
index 7463afd..7463afd 100644
--- a/security/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
index 7640045..7640045 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/CBCBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
index 95db190..95db190 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/CCMBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java
index 0f64f04..0f64f04 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/CFBBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java
index b8e5b61..b8e5b61 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/CTSBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java
index 007bffc..007bffc 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java
index f209b9f..f209b9f 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/OFBBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java
index f15ed67..f15ed67 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
index ce0b865..ce0b865 100644
--- a/security/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/modes/SICBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
index 7c4f0ae..7c4f0ae 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/BlockCipherPadding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java
index 63e29d8..63e29d8 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/ISO10126d2Padding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java
index 54c31a9..54c31a9 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/ISO7816d4Padding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java
index c005ff8..c005ff8 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/PKCS7Padding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java
index ec412b9..ec412b9 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/PaddedBufferedBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/TBCPadding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/TBCPadding.java
index 219912f..219912f 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/TBCPadding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/TBCPadding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/X923Padding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/X923Padding.java
index d4d34aa..d4d34aa 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/X923Padding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/X923Padding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/paddings/ZeroBytePadding.java b/luni/src/main/java/org/bouncycastle/crypto/paddings/ZeroBytePadding.java
index c756028..c756028 100644
--- a/security/src/main/java/org/bouncycastle/crypto/paddings/ZeroBytePadding.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/paddings/ZeroBytePadding.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java b/luni/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java
index 03ba725..03ba725 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/AsymmetricKeyParameter.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java
index 17f7344..17f7344 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DESParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DESParameters.java
index 5bee360..5bee360 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DESParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DESParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java
index d424fc1..d424fc1 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DESedeParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java
index 910081e..910081e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DHKeyGenerationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java
index e686f35..e686f35 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DHKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DHParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DHParameters.java
index def449c..def449c 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DHParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DHParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java
index 523f9a0..523f9a0 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DHPrivateKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DHPublicKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DHPublicKeyParameters.java
index 4f308ed..4f308ed 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DHPublicKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DHPublicKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java
index 94c1360..94c1360 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DHValidationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java
index 29fa91e..29fa91e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DSAKeyGenerationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java
index 11bb9d9..11bb9d9 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DSAKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java
index 7f76d11..7f76d11 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DSAParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java
index 3bef3f4..3bef3f4 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DSAPrivateKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java
index c006656..c006656 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DSAPublicKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java
index 541218b..541218b 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/DSAValidationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/IESParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/IESParameters.java
index 0600b34..0600b34 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/IESParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/IESParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java
index ef61b2c..ef61b2c 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java
index 8dffe2e..8dffe2e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java
index f3bac64..f3bac64 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java b/luni/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
index 5c4fe0e..5c4fe0e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/KeyParameter.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java
index 8c1ea5e..8c1ea5e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
index 4a1e6e9..4a1e6e9 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithIV.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java
index f8b7c82..f8b7c82 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithRandom.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java
index b226a9d..b226a9d 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java
index 73765dd..73765dd 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/RC2Parameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/RC2Parameters.java
index dc33ec5..dc33ec5 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/RC2Parameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/RC2Parameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java
index 6cbd57f..6cbd57f 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java
index 38b55fc..38b55fc 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/RSAKeyGenerationParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java
index 4a2d935..4a2d935 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/RSAKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java b/luni/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java
index b61cb5c..b61cb5c 100644
--- a/security/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/params/RSAPrivateCrtKeyParameters.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/signers/DSASigner.java b/luni/src/main/java/org/bouncycastle/crypto/signers/DSASigner.java
index a8392ab..a8392ab 100644
--- a/security/src/main/java/org/bouncycastle/crypto/signers/DSASigner.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/signers/DSASigner.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java b/luni/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java
index b617758..b617758 100644
--- a/security/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java b/luni/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java
index 43e3017..43e3017 100644
--- a/security/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java b/luni/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java
index ad4f53e..ad4f53e 100644
--- a/security/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java b/luni/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
index bb14375..bb14375 100644
--- a/security/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
diff --git a/security/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java b/luni/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
index c666800..c666800 100644
--- a/security/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
+++ b/luni/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/ErrorBundle.java b/luni/src/main/java/org/bouncycastle/i18n/ErrorBundle.java
index 803abed..803abed 100644
--- a/security/src/main/java/org/bouncycastle/i18n/ErrorBundle.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/ErrorBundle.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/LocalizedException.java b/luni/src/main/java/org/bouncycastle/i18n/LocalizedException.java
index 373fd6c..373fd6c 100644
--- a/security/src/main/java/org/bouncycastle/i18n/LocalizedException.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/LocalizedException.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java b/luni/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java
index 63825dd..63825dd 100644
--- a/security/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/MessageBundle.java b/luni/src/main/java/org/bouncycastle/i18n/MessageBundle.java
index 8848f0f..8848f0f 100644
--- a/security/src/main/java/org/bouncycastle/i18n/MessageBundle.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/MessageBundle.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/MissingEntryException.java b/luni/src/main/java/org/bouncycastle/i18n/MissingEntryException.java
index 11dfdc4..11dfdc4 100644
--- a/security/src/main/java/org/bouncycastle/i18n/MissingEntryException.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/MissingEntryException.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/TextBundle.java b/luni/src/main/java/org/bouncycastle/i18n/TextBundle.java
index 9d981d9..9d981d9 100644
--- a/security/src/main/java/org/bouncycastle/i18n/TextBundle.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/TextBundle.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/filter/Filter.java b/luni/src/main/java/org/bouncycastle/i18n/filter/Filter.java
index aee58cb..aee58cb 100644
--- a/security/src/main/java/org/bouncycastle/i18n/filter/Filter.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/filter/Filter.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java b/luni/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java
index defc610..defc610 100644
--- a/security/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java b/luni/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java
index ed3e488..ed3e488 100644
--- a/security/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java
diff --git a/security/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java b/luni/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java
index cc69ac4..cc69ac4 100644
--- a/security/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java
+++ b/luni/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java
diff --git a/security/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java b/luni/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
index f90ffa4..f90ffa4 100644
--- a/security/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
+++ b/luni/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
diff --git a/security/src/main/java/org/bouncycastle/jce/PKCS7SignedData.java b/luni/src/main/java/org/bouncycastle/jce/PKCS7SignedData.java
index cd05b9f..cd05b9f 100644
--- a/security/src/main/java/org/bouncycastle/jce/PKCS7SignedData.java
+++ b/luni/src/main/java/org/bouncycastle/jce/PKCS7SignedData.java
diff --git a/security/src/main/java/org/bouncycastle/jce/PrincipalUtil.java b/luni/src/main/java/org/bouncycastle/jce/PrincipalUtil.java
index 92a444c..92a444c 100644
--- a/security/src/main/java/org/bouncycastle/jce/PrincipalUtil.java
+++ b/luni/src/main/java/org/bouncycastle/jce/PrincipalUtil.java
diff --git a/security/src/main/java/org/bouncycastle/jce/X509KeyUsage.java b/luni/src/main/java/org/bouncycastle/jce/X509KeyUsage.java
index 2024b65..2024b65 100644
--- a/security/src/main/java/org/bouncycastle/jce/X509KeyUsage.java
+++ b/luni/src/main/java/org/bouncycastle/jce/X509KeyUsage.java
diff --git a/security/src/main/java/org/bouncycastle/jce/X509Principal.java b/luni/src/main/java/org/bouncycastle/jce/X509Principal.java
index 7051073..7051073 100644
--- a/security/src/main/java/org/bouncycastle/jce/X509Principal.java
+++ b/luni/src/main/java/org/bouncycastle/jce/X509Principal.java
diff --git a/security/src/main/java/org/bouncycastle/jce/X509V1CertificateGenerator.java b/luni/src/main/java/org/bouncycastle/jce/X509V1CertificateGenerator.java
index 4bd4c77..4bd4c77 100644
--- a/security/src/main/java/org/bouncycastle/jce/X509V1CertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/X509V1CertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/X509V2CRLGenerator.java b/luni/src/main/java/org/bouncycastle/jce/X509V2CRLGenerator.java
index dea70e2..dea70e2 100644
--- a/security/src/main/java/org/bouncycastle/jce/X509V2CRLGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/X509V2CRLGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/X509V3CertificateGenerator.java b/luni/src/main/java/org/bouncycastle/jce/X509V3CertificateGenerator.java
index aec0365..aec0365 100644
--- a/security/src/main/java/org/bouncycastle/jce/X509V3CertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/X509V3CertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java b/luni/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java
index a36abbb..a36abbb 100644
--- a/security/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java
+++ b/luni/src/main/java/org/bouncycastle/jce/interfaces/BCKeyStore.java
diff --git a/security/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java b/luni/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java
index f1d7901..f1d7901 100644
--- a/security/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java b/luni/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
index c5dd664..c5dd664 100644
--- a/security/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
+++ b/luni/src/main/java/org/bouncycastle/jce/interfaces/PKCS12BagAttributeCarrier.java
diff --git a/security/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java b/luni/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java
index ca3d8ea..ca3d8ea 100644
--- a/security/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java
+++ b/luni/src/main/java/org/bouncycastle/jce/netscape/NetscapeCertRequest.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java b/luni/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java
index e68139a..e68139a 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/AnnotatedException.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/luni/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
index 4ec32a9..4ec32a9 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java b/luni/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java
index a1350b2..a1350b2 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java b/luni/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java
index e6186f6..e6186f6 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java b/luni/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java
index 6ac4f49..6ac4f49 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java b/luni/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
index 8383b98..8383b98 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java b/luni/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java
index e1ac37c..e1ac37c 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/CertStoreCollectionSpi.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/DHUtil.java b/luni/src/main/java/org/bouncycastle/jce/provider/DHUtil.java
index 2470af9..2470af9 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/DHUtil.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/DHUtil.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/DSAUtil.java b/luni/src/main/java/org/bouncycastle/jce/provider/DSAUtil.java
index 5cf3c22..5cf3c22 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/DSAUtil.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/DSAUtil.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/IndexedPKIXParameters.java b/luni/src/main/java/org/bouncycastle/jce/provider/IndexedPKIXParameters.java
index 03679e2..03679e2 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/IndexedPKIXParameters.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/IndexedPKIXParameters.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEBlockCipher.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEBlockCipher.java
index e2b22cb..e2b22cb 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEBlockCipher.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEBlockCipher.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEDHKeyAgreement.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDHKeyAgreement.java
index f215029..f215029 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEDHKeyAgreement.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDHKeyAgreement.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java
index 07c71bf..07c71bf 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDHPrivateKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java
index 0534b4d..0534b4d 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDHPublicKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEDigestUtil.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDigestUtil.java
index a9f6d6a..a9f6d6a 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEDigestUtil.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEDigestUtil.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEIESCipher.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEIESCipher.java
index 95ee2b6..95ee2b6 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEIESCipher.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEIESCipher.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEKeyGenerator.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEKeyGenerator.java
index 23c3bf7..23c3bf7 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEKeyGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEKeyGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEMac.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEMac.java
index 74d8147..74d8147 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEMac.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEMac.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEPBEKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEPBEKey.java
index 13b5230..13b5230 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEPBEKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEPBEKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCERSACipher.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSACipher.java
index 54b49c0..54b49c0 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCERSACipher.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSACipher.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java
index 0971e90..0971e90 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateCrtKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java
index 74b8d08..74b8d08 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSAPrivateKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java
index e546323..e546323 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCERSAPublicKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCESecretKeyFactory.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCESecretKeyFactory.java
index 0a45b74..0a45b74 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCESecretKeyFactory.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCESecretKeyFactory.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java b/luni/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java
index fe1a2be..fe1a2be 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JCEStreamCipher.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameterGenerator.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameterGenerator.java
index a72cb13..a72cb13 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameterGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameterGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameters.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameters.java
index e3f476d..e3f476d 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameters.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKAlgorithmParameters.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java
index 111ab5b..111ab5b 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDSAPrivateKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java
index 56e8470..56e8470 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDSAPublicKey.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKDSASigner.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDSASigner.java
index 9a5eb66..9a5eb66 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKDSASigner.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDSASigner.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKDigestSignature.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDigestSignature.java
index 5eea220..5eea220 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKDigestSignature.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKDigestSignature.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKECDSAAlgParameters.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKECDSAAlgParameters.java
index 557c705..557c705 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKECDSAAlgParameters.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKECDSAAlgParameters.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKISOSignature.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKISOSignature.java
index ec8667d..ec8667d 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKISOSignature.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKISOSignature.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyFactory.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKKeyFactory.java
index d5a05df..d5a05df 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyFactory.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKKeyFactory.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java
index 24233d6..24233d6 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKKeyPairGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyStore.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKKeyStore.java
index 0b1002a..0b1002a 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKKeyStore.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKKeyStore.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKMessageDigest.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKMessageDigest.java
index bc8f7dd..bc8f7dd 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKMessageDigest.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKMessageDigest.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java
index 3cf05b1..3cf05b1 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKPKCS12KeyStore.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKPSSSigner.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKPSSSigner.java
index 33df9fd..33df9fd 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKPSSSigner.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKPSSSigner.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java b/luni/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java
index 31507c6..31507c6 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/JDKX509CertificateFactory.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PBE.java b/luni/src/main/java/org/bouncycastle/jce/provider/PBE.java
index 414076d..414076d 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/PBE.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/PBE.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java
index 69585b8..69585b8 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXCertPath.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java
index 577e5ca..577e5ca 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathBuilderSpi.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
index f5d6711..f5d6711 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java
index 3437605..3437605 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/PKIXPolicyNode.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/RSAUtil.java b/luni/src/main/java/org/bouncycastle/jce/provider/RSAUtil.java
index 0d99117..0d99117 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/RSAUtil.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/RSAUtil.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/WrapCipherSpi.java b/luni/src/main/java/org/bouncycastle/jce/provider/WrapCipherSpi.java
index 5ac8938..5ac8938 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/WrapCipherSpi.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/WrapCipherSpi.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java b/luni/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java
index ebf37fb..ebf37fb 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/X509CRLEntryObject.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java b/luni/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java
index 7533947..7533947 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/X509CRLObject.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java b/luni/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
index d17fd59..d17fd59 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
diff --git a/security/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java b/luni/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
index 2a79524..2a79524 100644
--- a/security/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
+++ b/luni/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
diff --git a/security/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java b/luni/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java
index 9859a22..9859a22 100644
--- a/security/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java
+++ b/luni/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java
diff --git a/security/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java b/luni/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java
index 97c7d3a..97c7d3a 100644
--- a/security/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java
+++ b/luni/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java
diff --git a/security/src/main/java/org/bouncycastle/openssl/PEMWriter.java b/luni/src/main/java/org/bouncycastle/openssl/PEMWriter.java
index 5cbdf91..5cbdf91 100644
--- a/security/src/main/java/org/bouncycastle/openssl/PEMWriter.java
+++ b/luni/src/main/java/org/bouncycastle/openssl/PEMWriter.java
diff --git a/security/src/main/java/org/bouncycastle/util/Arrays.java b/luni/src/main/java/org/bouncycastle/util/Arrays.java
index c6566d3..c6566d3 100644
--- a/security/src/main/java/org/bouncycastle/util/Arrays.java
+++ b/luni/src/main/java/org/bouncycastle/util/Arrays.java
diff --git a/security/src/main/java/org/bouncycastle/util/BigIntegers.java b/luni/src/main/java/org/bouncycastle/util/BigIntegers.java
index 3d1c456..3d1c456 100644
--- a/security/src/main/java/org/bouncycastle/util/BigIntegers.java
+++ b/luni/src/main/java/org/bouncycastle/util/BigIntegers.java
diff --git a/security/src/main/java/org/bouncycastle/util/Strings.java b/luni/src/main/java/org/bouncycastle/util/Strings.java
index ff42595..ff42595 100644
--- a/security/src/main/java/org/bouncycastle/util/Strings.java
+++ b/luni/src/main/java/org/bouncycastle/util/Strings.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/Base64.java b/luni/src/main/java/org/bouncycastle/util/encoders/Base64.java
index 1dc94b5..1dc94b5 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/Base64.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/Base64.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/Base64Encoder.java b/luni/src/main/java/org/bouncycastle/util/encoders/Base64Encoder.java
index 3edc068..3edc068 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/Base64Encoder.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/Base64Encoder.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java b/luni/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java
index 672430a..672430a 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java b/luni/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java
index 107eee8..107eee8 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/Encoder.java b/luni/src/main/java/org/bouncycastle/util/encoders/Encoder.java
index b066121..b066121 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/Encoder.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/Encoder.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/Hex.java b/luni/src/main/java/org/bouncycastle/util/encoders/Hex.java
index d69f773..d69f773 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/Hex.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/Hex.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java b/luni/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java
index 0dcae29..0dcae29 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/HexEncoder.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java b/luni/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java
index 3fff65a..3fff65a 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/Translator.java b/luni/src/main/java/org/bouncycastle/util/encoders/Translator.java
index a3a0cb8..a3a0cb8 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/Translator.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/Translator.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java b/luni/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java
index a22d94a..a22d94a 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java
diff --git a/security/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java b/luni/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java
index a5fff5e..a5fff5e 100644
--- a/security/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java
+++ b/luni/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java
diff --git a/security/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java b/luni/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java
index d8aa122..d8aa122 100644
--- a/security/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java
+++ b/luni/src/main/java/org/bouncycastle/x509/AttributeCertificateHolder.java
diff --git a/security/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java b/luni/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java
index 0679a5c..0679a5c 100644
--- a/security/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java
+++ b/luni/src/main/java/org/bouncycastle/x509/AttributeCertificateIssuer.java
diff --git a/security/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java b/luni/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java
index 173d478..173d478 100644
--- a/security/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java
+++ b/luni/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java
diff --git a/security/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages.properties b/luni/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages.properties
index 9df5e89..9df5e89 100644
--- a/security/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages.properties
+++ b/luni/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages.properties
diff --git a/security/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java b/luni/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java
index cc00697..cc00697 100644
--- a/security/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java
+++ b/luni/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509Attribute.java b/luni/src/main/java/org/bouncycastle/x509/X509Attribute.java
index f4c65ab..f4c65ab 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509Attribute.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509Attribute.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java b/luni/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java
index f3b0668..f3b0668 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509AttributeCertificate.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509Util.java b/luni/src/main/java/org/bouncycastle/x509/X509Util.java
index 854ec3a..854ec3a 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509Util.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509Util.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java b/luni/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java
index 09531b6..09531b6 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509V1CertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java b/luni/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java
index 7348b87..7348b87 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificate.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificateGenerator.java b/luni/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificateGenerator.java
index ec1a0d7..ec1a0d7 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509V2AttributeCertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java b/luni/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java
index f639be6..f639be6 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java b/luni/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java
index acfa0b4..acfa0b4 100644
--- a/security/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java
+++ b/luni/src/main/java/org/bouncycastle/x509/X509V3CertificateGenerator.java
diff --git a/security/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java b/luni/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java
index 2280198..2280198 100644
--- a/security/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java
+++ b/luni/src/main/java/org/bouncycastle/x509/extension/AuthorityKeyIdentifierStructure.java
diff --git a/security/src/main/java/org/bouncycastle/x509/extension/SubjectKeyIdentifierStructure.java b/luni/src/main/java/org/bouncycastle/x509/extension/SubjectKeyIdentifierStructure.java
index 0b7ecd6..0b7ecd6 100644
--- a/security/src/main/java/org/bouncycastle/x509/extension/SubjectKeyIdentifierStructure.java
+++ b/luni/src/main/java/org/bouncycastle/x509/extension/SubjectKeyIdentifierStructure.java
diff --git a/security/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java b/luni/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java
index 22b1c12..22b1c12 100644
--- a/security/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java
+++ b/luni/src/main/java/org/bouncycastle/x509/extension/X509ExtensionUtil.java
diff --git a/suncompat/src/main/java/sun/misc/Unsafe.java b/luni/src/main/java/sun/misc/Unsafe.java
index 5c6aa01..5c6aa01 100644
--- a/suncompat/src/main/java/sun/misc/Unsafe.java
+++ b/luni/src/main/java/sun/misc/Unsafe.java
diff --git a/archive/src/main/native/hy2sie.h b/luni/src/main/native/hy2sie.h
index d40d0e8..d40d0e8 100644
--- a/archive/src/main/native/hy2sie.h
+++ b/luni/src/main/native/hy2sie.h
diff --git a/archive/src/main/native/hymutex.h b/luni/src/main/native/hymutex.h
index 5c98ebd..5c98ebd 100644
--- a/archive/src/main/native/hymutex.h
+++ b/luni/src/main/native/hymutex.h
diff --git a/archive/src/main/native/hyport.h b/luni/src/main/native/hyport.h
index 029d4fe..029d4fe 100644
--- a/archive/src/main/native/hyport.h
+++ b/luni/src/main/native/hyport.h
diff --git a/archive/src/main/native/java_util_zip_Adler32.c b/luni/src/main/native/java_util_zip_Adler32.c
index 4410e5b..4410e5b 100644
--- a/archive/src/main/native/java_util_zip_Adler32.c
+++ b/luni/src/main/native/java_util_zip_Adler32.c
diff --git a/archive/src/main/native/java_util_zip_CRC32.c b/luni/src/main/native/java_util_zip_CRC32.c
index 95369a2..95369a2 100644
--- a/archive/src/main/native/java_util_zip_CRC32.c
+++ b/luni/src/main/native/java_util_zip_CRC32.c
diff --git a/archive/src/main/native/java_util_zip_Deflater.c b/luni/src/main/native/java_util_zip_Deflater.c
index 59c7433..59c7433 100644
--- a/archive/src/main/native/java_util_zip_Deflater.c
+++ b/luni/src/main/native/java_util_zip_Deflater.c
diff --git a/archive/src/main/native/java_util_zip_Inflater.c b/luni/src/main/native/java_util_zip_Inflater.c
index 6281081..6281081 100644
--- a/archive/src/main/native/java_util_zip_Inflater.c
+++ b/luni/src/main/native/java_util_zip_Inflater.c
diff --git a/archive/src/main/native/sieb.c b/luni/src/main/native/sieb.c
index 4529307..4529307 100644
--- a/archive/src/main/native/sieb.c
+++ b/luni/src/main/native/sieb.c
diff --git a/archive/src/main/native/sieb.h b/luni/src/main/native/sieb.h
index c32da04..c32da04 100644
--- a/archive/src/main/native/sieb.h
+++ b/luni/src/main/native/sieb.h
diff --git a/luni/src/main/native/sub.mk b/luni/src/main/native/sub.mk
index a562e4c..8b2f277 100644
--- a/luni/src/main/native/sub.mk
+++ b/luni/src/main/native/sub.mk
@@ -15,21 +15,32 @@ LOCAL_SRC_FILES := \
 	java_lang_StrictMath.c \
 	java_net_InetAddress.cpp \
 	java_net_NetworkInterface.cpp \
+	java_util_zip_Adler32.c \
+	java_util_zip_CRC32.c \
+	java_util_zip_Deflater.c \
+	java_util_zip_Inflater.c \
 	cbigint.c \
 	commonDblParce.c \
 	org_apache_harmony_luni_util_fltparse.c \
 	org_apache_harmony_luni_util_NumberConvert.c \
 	org_apache_harmony_luni_platform_OSNetworkSystem.cpp \
 	org_apache_harmony_luni_platform_OSFileSystem.cpp \
-	org_apache_harmony_luni_platform_OSMemory.cpp
+	org_apache_harmony_luni_platform_OSMemory.cpp \
+	zip.c \
+	zipalloc.c \
+	sieb.c
 
-LOCAL_C_INCLUDES +=
+
+LOCAL_C_INCLUDES += \
+	external/zlib
 
 # Any shared/static libs that are listed here must also
 # be listed in libs/nativehelper/Android.mk.
 # TODO: fix this requirement
 
-LOCAL_SHARED_LIBRARIES += libutils
+LOCAL_SHARED_LIBRARIES += \
+	libutils \
+	libz
 
 LOCAL_STATIC_LIBRARIES += \
 	libfdlibm
diff --git a/archive/src/main/native/zip.c b/luni/src/main/native/zip.c
index 3d15d2a..3d15d2a 100644
--- a/archive/src/main/native/zip.c
+++ b/luni/src/main/native/zip.c
diff --git a/archive/src/main/native/zip.h b/luni/src/main/native/zip.h
index 1452073..1452073 100644
--- a/archive/src/main/native/zip.h
+++ b/luni/src/main/native/zip.h
diff --git a/archive/src/main/native/zipalloc.c b/luni/src/main/native/zipalloc.c
index 2b4966b..2b4966b 100644
--- a/archive/src/main/native/zipalloc.c
+++ b/luni/src/main/native/zipalloc.c
diff --git a/archive/src/main/native/zipsup.c b/luni/src/main/native/zipsup.c
index d6d07da..d6d07da 100644
--- a/archive/src/main/native/zipsup.c
+++ b/luni/src/main/native/zipsup.c
diff --git a/archive/src/main/native/zipsup.h b/luni/src/main/native/zipsup.h
index 67a2eda..67a2eda 100644
--- a/archive/src/main/native/zipsup.h
+++ b/luni/src/main/native/zipsup.h
diff --git a/archive/src/test/java-internal/org/apache/harmony/archive/util/UtilTest.java b/luni/src/test/java-internal/org/apache/harmony/archive/util/UtilTest.java
index 7e1c4bd..7e1c4bd 100644
--- a/archive/src/test/java-internal/org/apache/harmony/archive/util/UtilTest.java
+++ b/luni/src/test/java-internal/org/apache/harmony/archive/util/UtilTest.java
diff --git a/archive/src/test/java/java/util/zip/AllTests.java b/luni/src/test/java/java/util/zip/AllTests.java
index df1d8de..df1d8de 100644
--- a/archive/src/test/java/java/util/zip/AllTests.java
+++ b/luni/src/test/java/java/util/zip/AllTests.java
diff --git a/archive/src/test/java/java/util/zip/DeflaterOutputStreamTest.java b/luni/src/test/java/java/util/zip/DeflaterOutputStreamTest.java
index 5d155fe..5d155fe 100644
--- a/archive/src/test/java/java/util/zip/DeflaterOutputStreamTest.java
+++ b/luni/src/test/java/java/util/zip/DeflaterOutputStreamTest.java
diff --git a/archive/src/test/java/java/util/zip/DeflaterTest.java b/luni/src/test/java/java/util/zip/DeflaterTest.java
index d8ce66e..d8ce66e 100644
--- a/archive/src/test/java/java/util/zip/DeflaterTest.java
+++ b/luni/src/test/java/java/util/zip/DeflaterTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java
index c2b179e..c2b179e 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AllTests.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java
index b80f3a9..b80f3a9 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java
index e9657de..e9657de 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java
index 37ee8c1..37ee8c1 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java
index d81cabd..d81cabd 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java
index d44b90a..d44b90a 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java
index c4f7c03..c4f7c03 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation1.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation1.java
index 64393ef..64393ef 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation1.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation1.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation2.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation2.java
index d3c7d42..d3c7d42 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation2.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation2.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java
index 3228c66..3228c66 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java
index 5411011..5411011 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation3b.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation4.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation4.java
index 2267536..2267536 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation4.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestAnnotation4.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1.java
index f8ed73d..f8ed73d 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1.java
diff --git a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1b.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1b.java
index 874d893..874d893 100644
--- a/annotation/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1b.java
+++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/TestEnum1b.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java
index 7b39de6..7b39de6 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AllTests.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java
index efeb128..efeb128 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesNameTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
index f437d20..f437d20 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/AttributesTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java
index a8c6148..a8c6148 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/DalvikExecTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java
index e179024..e179024 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarEntryTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
index 9a0caf4..9a0caf4 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExceptionTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java
index e2a11c7..e2a11c7 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarExecTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
index 67debfc..67debfc 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
index 06853e7..06853e7 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
index 72dfcab..72dfcab 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarOutputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
index 0834fb1..0834fb1 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ManifestTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java
index 5e4b668..5e4b668 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200PackerTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200Test.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200Test.java
index 0e2b688..0e2b688 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200Test.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200Test.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java
index 249a7cf..249a7cf 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/Pack200UnpackerTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java
index 5ce657b..5ce657b 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/ZipExecTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java
index 7290ac2..7290ac2 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/Adler32Test.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java
index bf27661..bf27661 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/AllTests.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java
index 7eb0566..7eb0566 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CRC32Test.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
index 393923d..393923d 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedInputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java
index 9a56226..9a56226 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/CheckedOutputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DataFormatExceptionTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DataFormatExceptionTest.java
index 929227d..929227d 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DataFormatExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DataFormatExceptionTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java
index 9ed0f67..9ed0f67 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterInputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java
index be28774..be28774 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterOutputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
index 93fe710..93fe710 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/DeflaterTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
index 3431510..3431510 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
index fdcc3fa..fdcc3fa 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPOutputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
index 3ab7a64..3ab7a64 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java
index 9627613..9627613 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterOutputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
index 49be8d0..49be8d0 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
index be5d0c6..be5d0c6 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipEntryTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipExceptionTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipExceptionTest.java
index 9f3be8d..9f3be8d 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipExceptionTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
index 7ff4f98..7ff4f98 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
index 02ddd08..02ddd08 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipInputStreamTest.java
diff --git a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
index 7adfeff..7adfeff 100644
--- a/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipOutputStreamTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java
index aa3240f..aa3240f 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/AllTests.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
index 6297392..6297392 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java
index 98ea555..98ea555 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java
index 64562bb..64562bb 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java
index 237af28..237af28 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java
index aadad1a..aadad1a 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java
index 56e83c6..56e83c6 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
index c7c1a5d..c7c1a5d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
index 63ed789..63ed789 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
index a26e605..a26e605 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java
index 793edcb..793edcb 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
index d93c156..d93c156 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
index b98297d..b98297d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java
index 3954608..3954608 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
index 6f1db9e..6f1db9e 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java
index 0605986..0605986 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
index 8451979..8451979 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java
index 270adaa..270adaa 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
index 5e2414e..5e2414e 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
index da4a94d..da4a94d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
index f521690..f521690 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java
index 5fb0245..5fb0245 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java
index bcc05a2..bcc05a2 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
index 6526239..6526239 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
index 4e34ed2..4e34ed2 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
index 4390994..4390994 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/AllTests.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/AllTests.java
index 68b6720..68b6720 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/AllTests.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java
index d00c62b..d00c62b 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java
index a5d8d90..a5d8d90 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java
index 7352e83..7352e83 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java
index 2169a93..2169a93 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java
index 6f8fbc3..6f8fbc3 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java
index 3ea1f13..3ea1f13 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java
index 0e8dc4d..0e8dc4d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBEThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java
index 5acc5b5..5acc5b5 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java
index 8efc0f6..8efc0f6 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSAThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherSymmetricKeyThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherSymmetricKeyThread.java
index 63faada..63faada 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherSymmetricKeyThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherSymmetricKeyThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java
index 25d51c4..25d51c4 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherWrapThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherWrapThread.java
index b0eabe2..b0eabe2 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherWrapThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherWrapThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java
index 2027df1..2027df1 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java
index b8453c2..b8453c2 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java
index 50b6ef6..50b6ef6 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java
index 52a7b5d..52a7b5d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java
index 6452cb4..6452cb4 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java
index de519d7..de519d7 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java
index 35fb490..35fb490 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryThread.java
index d426939..d426939 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java
index f970b1a..f970b1a 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/TestThread.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/AllTests.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/AllTests.java
index b47c23e..b47c23e 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/AllTests.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
index 5130e1e..5130e1e 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
index da39db0..da39db0 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
index 43d9265..43d9265 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/AllTests.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/AllTests.java
index 02e0bbb..02e0bbb 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/AllTests.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
index 3992d44..3992d44 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
index 33665d0..33665d0 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
index 652c0b0..652c0b0 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
index 12b98fb..12b98fb 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
index c42a5cb..c42a5cb 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/AllTests.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/AllTests.java
index cdd3d51..cdd3d51 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/AllTests.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
index 9106a87..9106a87 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
index 3f8ce0a..3f8ce0a 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java
index aef1286..aef1286 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
index 65d1a17..65d1a17 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java
index 327004a..327004a 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java
index 905d8cd..905d8cd 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java
index 1c27f68..1c27f68 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
index 3fa2d72..3fa2d72 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java
index bbce868..bbce868 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java
index 6bca15c..6bca15c 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java
index ac3c5e5..ac3c5e5 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
index 6eb636f..6eb636f 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
index 9b7704d..9b7704d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
index b39bb1d..b39bb1d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
index 7ca0e6a..7ca0e6a 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/EncryptedPrivateKeyInfoData.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyCipher.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyCipher.java
index c9eb26e..c9eb26e 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyCipher.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyCipher.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
index ddd6f26..ddd6f26 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyExemptionMechanismSpi.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
index 51e541a..51e541a 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyAgreementSpi.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
index 86b21c2..86b21c2 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyKeyGeneratorSpi.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
index 8913c2e..8913c2e 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MyMacSpi.java
diff --git a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
index 0dbff5d..0dbff5d 100644
--- a/crypto/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
+++ b/luni/src/test/java/org/apache/harmony/crypto/tests/support/MySecretKeyFactorySpi.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
index 7807768..7807768 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/AllTests.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
index b2204a3..b2204a3 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ConsoleHandlerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
index d8c0053..d8c0053 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/ErrorManagerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
index da0111b..da0111b 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
index 1d105e0..1d105e0 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FilterTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
index 47b9170..47b9170 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/FormatterTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
index 2f13f2d..2f13f2d 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/HandlerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
index 2dbe206..2dbe206 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java
index 5e06b70..5e06b70 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LevelTestResource.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
index eff8745..eff8745 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
index 7d8757e..7d8757e 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
index 17233a1..17233a1 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java
index 36cfb33..36cfb33 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingMXBeanTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
index aa8f7fa..aa8f7fa 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
index 89629c7..89629c7 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/MemoryHandlerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
index 16d051d..16d051d 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
index bbf30b0..bbf30b0 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
index 76380e6..76380e6 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/StreamHandlerTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
index 175ffb5..175ffb5 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/XMLFormatterTest.java
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
index 0dafe68..0dafe68 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
+++ b/luni/src/test/java/org/apache/harmony/logging/tests/java/util/logging/util/EnvironmentHelper.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/AllTests.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/AllTests.java
index 21f2ec5..21f2ec5 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/AllTests.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java
index bdb4cf9..bdb4cf9 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalArithmeticTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java
index b20491b..b20491b 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalCompareTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java
index 3657096..3657096 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConstructorsTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java
index e9a150e..e9a150e 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalConvertTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java
index aa91f08..aa91f08 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigDecimalScaleOperationsTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java
index e3129cc..e3129cc 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAddTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java
index fb1f9db..fb1f9db 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerAndTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java
index bfd1070..bfd1070 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerCompareTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java
index 1835d68..1835d68 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConstructorsTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java
index c0f17b1..c0f17b1 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerConvertTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java
index b3fec51..b3fec51 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerDivideTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java
index a63a514..a63a514 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerHashCodeTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java
index 1c5cba3..1c5cba3 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerModPowTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java
index e016294..e016294 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerMultiplyTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java
index c88c412..c88c412 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerNotTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java
index d55a992..d55a992 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOperateBitsTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java
index 175a7a7..175a7a7 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerOrTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java
index 1103a08..1103a08 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerSubtractTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerToStringTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerToStringTest.java
index 34b4b19..34b4b19 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerToStringTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerToStringTest.java
diff --git a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java
index b55b60b..b55b60b 100644
--- a/math/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java
+++ b/luni/src/test/java/org/apache/harmony/math/tests/java/math/BigIntegerXorTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
index 5b35982..5b35982 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java
index 9c56d76..9c56d76 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/AllTests.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
index 4394405..4394405 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
index 70c6c8f..70c6c8f 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
index c3e2256..c3e2256 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
index e7c5f5c..e7c5f5c 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
index 0f65a9c..0f65a9c 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
index b7ae917..b7ae917 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
index 1adfe89..1adfe89 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
index 5439fcf..5439fcf 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
index ec06c9b..ec06c9b 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java
index 00ed64b..00ed64b 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/AllTests.java
diff --git a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java
index b7f1632..b7f1632 100644
--- a/nio_char/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/spi/CharsetProviderTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/AllTests.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/AllTests.java
index 55d3bf0..55d3bf0 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/AllTests.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java
index ab0de63..ab0de63 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java
index adb3bc7..adb3bc7 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/MatcherTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java
index bad03f7..bad03f7 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java
index 3f4ac19..3f4ac19 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java
index a9b782b..a9b782b 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java
index 9f3f389..9f3f389 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java
index 5b979cf..5b979cf 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java
index 82390e7..82390e7 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java
diff --git a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
index 894dfff..894dfff 100644
--- a/regex/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
+++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java
index f751b55..f751b55 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
index 9825291..9825291 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java
index e9833e2..e9833e2 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java
index 69c994d..69c994d 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java
index c67822a..c67822a 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java
index 407438d..407438d 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator3Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java
index f65cc80..f65cc80 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
index 13ac904..13ac904 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java
index a12629c..a12629c 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java
index c0d5640..c0d5640 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllTests.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java
index 1033236..1033236 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java
index 2db4998..2db4998 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java
index f94cb27..f94cb27 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
index fa94fbf..fa94fbf 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
index eeef8ac..eeef8ac 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
index b6f0fe2..b6f0fe2 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
index 93ffe77..93ffe77 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStream2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
index 0eed898..0eed898 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
index ca80f19..ca80f19 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestOutputStreamTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
index 5bdd450..5bdd450 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java
index e717747..e717747 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
index 865bbea..865bbea 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java
index 3fca2fa..3fca2fa 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
index c11f90a..c11f90a 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
index 849f29c..849f29c 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
index 5f5f7da..5f5f7da 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
index c22b903..c22b903 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java
index 056d7eb..056d7eb 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java
index 0c8ec0a..0c8ec0a 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java
index 0cb1400..0cb1400 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java
index f4c995d..f4c995d 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java
index ba6b325..ba6b325 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
index af46c54..af46c54 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java
index d7852b3..d7852b3 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java
index c0f548c..c0f548c 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
index 44fb48f..44fb48f 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
index 67c2284..67c2284 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java
index efa9bf0..efa9bf0 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java
index 5fe110c..5fe110c 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java
index 24867e7..24867e7 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java
index d64a8e6..d64a8e6 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java
index 689e6ce..689e6ce 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java
index a428334..a428334 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java
index a782624..a782624 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java
index 0bfbe1f..0bfbe1f 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
index 059cef4..059cef4 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
index a2687c3..a2687c3 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java
index bf5b136..bf5b136 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java
index 6bba4a8..6bba4a8 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
index ac62d58..ac62d58 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java
index 065679c..065679c 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreLoadStoreParameterTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java
index 42feeec..42feeec 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStorePrivateKeyEntryTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java
index 9f25a7b..9f25a7b 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
index 210116e..210116e 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java
index ddbddc4..ddbddc4 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java
index f22b875..f22b875 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest1Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
index 9eca936..9eca936 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java
index 8bcb392..8bcb392 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
index 9a6b457..9a6b457 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
index 7cb1558..7cb1558 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java
index cace8fc..cace8fc 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
index 82815eb..82815eb 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java
index f1a3cf3..f1a3cf3 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java
index a60adbf..a60adbf 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java
index 99d39f3..99d39f3 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
index 1f64d34..1f64d34 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java
index b968a03..b968a03 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java
index 90caa6f..90caa6f 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
index f1e1b42..f1e1b42 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java
index 6525f82..6525f82 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java
index 8d74f42..8d74f42 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java
index 7397a08..7397a08 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
index a8ec69a..a8ec69a 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
index 2350679..2350679 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java
index 730e329..730e329 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java
index 885d0e5..885d0e5 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java
index f9efe56..f9efe56 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java
index 138f4dc..138f4dc 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java
index 8ca84b9..8ca84b9 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecureRandomSpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java
index a59ada5..a59ada5 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java
index 6a771dc..6a771dc 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
index fcda610..fcda610 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java
index aa4c71b..aa4c71b 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java
index a657f60..a657f60 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
index 5e2bfe3..5e2bfe3 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java
index 46f40af..46f40af 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java
index f7d8eed..f7d8eed 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java
index 89d872e..89d872e 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java
index 267221c..267221c 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java
index f965337..f965337 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java
index 96b0847..96b0847 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
index dda3231..dda3231 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java
diff --git a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java
index d03b43d..d03b43d 100644
--- a/security/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/AllTests.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/AllTests.java
index 1b0bb59..1b0bb59 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/AllTests.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
index 87e737e..87e737e 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
index 823c8a5..823c8a5 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
index bafd679..bafd679 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
index 5c63c5a..5c63c5a 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
index 39f5074..39f5074 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
index 069d46f..069d46f 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
index 0f92491..0f92491 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
index b488880..b488880 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
index dc28c4c..dc28c4c 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
index bd9b18f..bd9b18f 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
index 53a8a71..53a8a71 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
index 5122478..5122478 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
index 2307f8e..2307f8e 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
index fb3e550..fb3e550 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
index 8368dad..8368dad 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
index d782444..d782444 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
index 8638d2b..8638d2b 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
index 6d495d6..6d495d6 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
index f78bb31..f78bb31 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
index 3e7000c..3e7000c 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
index b228466..b228466 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
index 773684e..773684e 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestMainForDriver.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestMainForDriver.java
index 0fe7f67..0fe7f67 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestMainForDriver.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TestMainForDriver.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
index 558e00d..558e00d 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
index c1c09a0..c1c09a0 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
index 948d95f..948d95f 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/AllTests.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/AllTests.java
index 8183bbf..8183bbf 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/AllTests.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
index 12d4364..12d4364 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
index 0eca2d2..0eca2d2 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
index 946c40d..946c40d 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
diff --git a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
index 9f048f7..9f048f7 100644
--- a/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
+++ b/luni/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java
index d5c539e..d5c539e 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AllTests.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java
index e6af410..e6af410 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AnnotationTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
index ad4c9ca..ad4c9ca 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorAttributeTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java
index 8178760..8178760 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedCharacterIteratorTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java
index 86deba5..86deba5 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/AttributedStringTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java
index be618c7..be618c7 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BidiTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java
index b64bafb..b64bafb 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/BreakIteratorTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java
index 3bec58a..3bec58a 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ChoiceFormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
index 19dbb11..19dbb11 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java
index c2135c3..c2135c3 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollationKeyTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java
index 92225d7..92225d7 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/CollatorTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java
index ff6dd8e..ff6dd8e 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DataFormatFieldTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
index e3772c0..e3772c0 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
index bf7376a..bf7376a 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
index 604f0ea..604f0ea 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatSymbolsTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
index c1f1808..c1f1808 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java
index 08ae892..08ae892 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTestICU.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
index 7df1a33..7df1a33 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FieldPositionTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java
index cf1c124..cf1c124 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatFieldTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java
index 4c5cc36..4c5cc36 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/FormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java
index b5302b6..b5302b6 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatFieldTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
index 6b10d15..6b10d15 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java
index f877ae2..f877ae2 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NormalizerTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java
index e6c79cd..e6c79cd 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatFieldTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java
index e949f1d..e949f1d 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/NumberFormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java
index 3bcc38c..3bcc38c 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParseExceptionTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java
index 89cb7e4..89cb7e4 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/ParsePositionTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
index 5b8146c..5b8146c 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
index 0f77270..0f77270 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java
index df68dde..df68dde 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/StringCharacterIteratorTest.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
index 2fe1107..2fe1107 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_DecimalFormat.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
index ffcdf1c..ffcdf1c 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_Format.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
index 454caeb..454caeb 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_MessageFormat.java
diff --git a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
index 24a436b..24a436b 100644
--- a/text/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
+++ b/luni/src/test/java/org/apache/harmony/text/tests/java/text/Support_SimpleDateFormat.java
diff --git a/security/src/test/java/org/bouncycastle/jce/provider/AllTests.java b/luni/src/test/java/org/bouncycastle/jce/provider/AllTests.java
index f9bf52f..f9bf52f 100644
--- a/security/src/test/java/org/bouncycastle/jce/provider/AllTests.java
+++ b/luni/src/test/java/org/bouncycastle/jce/provider/AllTests.java
diff --git a/security/src/test/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpiTest.java b/luni/src/test/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpiTest.java
index 734e11d..734e11d 100644
--- a/security/src/test/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpiTest.java
+++ b/luni/src/test/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpiTest.java
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser
index a7d6333..a7d6333 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.0.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser
index 447c1f4..447c1f4 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.1.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser
index ae028bd..ae028bd 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.golden.2.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser
index 60c67c0..60c67c0 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.0.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser
index 58b303f..58b303f 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.1.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser
index ee41ad6..ee41ad6 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.golden.2.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser
index 98823fc..98823fc 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.0.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser
index a69ae56..a69ae56 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.1.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser
index f23826c..f23826c 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.golden.2.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser
index 0cdc09d..0cdc09d 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.0.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser
index 3a12187..3a12187 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.1.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser
index 5818cd4..5818cd4 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.golden.2.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser
index 1f8e55f..1f8e55f 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.0.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser
index b0fadb2..b0fadb2 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.1.ser
diff --git a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser
index 9edf260..9edf260 100644
--- a/crypto/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser
+++ b/luni/src/test/java/serialization/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.golden.2.ser
diff --git a/suncompat/src/test/java/sun/misc/AllTests.java b/luni/src/test/java/sun/misc/AllTests.java
index f2c4277..f2c4277 100644
--- a/suncompat/src/test/java/sun/misc/AllTests.java
+++ b/luni/src/test/java/sun/misc/AllTests.java
diff --git a/suncompat/src/test/java/sun/misc/UnsafeTest.java b/luni/src/test/java/sun/misc/UnsafeTest.java
index 462d39d..462d39d 100644
--- a/suncompat/src/test/java/sun/misc/UnsafeTest.java
+++ b/luni/src/test/java/sun/misc/UnsafeTest.java
diff --git a/sql/src/test/java/tests/SQLite/AbstractSqlTest.java b/luni/src/test/java/tests/SQLite/AbstractSqlTest.java
index 0c7fa61..0c7fa61 100644
--- a/sql/src/test/java/tests/SQLite/AbstractSqlTest.java
+++ b/luni/src/test/java/tests/SQLite/AbstractSqlTest.java
diff --git a/sql/src/test/java/tests/SQLite/AllTests.java b/luni/src/test/java/tests/SQLite/AllTests.java
index ea8b841..ea8b841 100644
--- a/sql/src/test/java/tests/SQLite/AllTests.java
+++ b/luni/src/test/java/tests/SQLite/AllTests.java
diff --git a/sql/src/test/java/tests/SQLite/BlobTest.java b/luni/src/test/java/tests/SQLite/BlobTest.java
index 9960eb5..9960eb5 100644
--- a/sql/src/test/java/tests/SQLite/BlobTest.java
+++ b/luni/src/test/java/tests/SQLite/BlobTest.java
diff --git a/sql/src/test/java/tests/SQLite/DatabaseTest.java b/luni/src/test/java/tests/SQLite/DatabaseTest.java
index 12a556d..12a556d 100644
--- a/sql/src/test/java/tests/SQLite/DatabaseTest.java
+++ b/luni/src/test/java/tests/SQLite/DatabaseTest.java
diff --git a/sql/src/test/java/tests/SQLite/ExceptionTest.java b/luni/src/test/java/tests/SQLite/ExceptionTest.java
index fe86e8f..fe86e8f 100644
--- a/sql/src/test/java/tests/SQLite/ExceptionTest.java
+++ b/luni/src/test/java/tests/SQLite/ExceptionTest.java
diff --git a/sql/src/test/java/tests/SQLite/FunctionContextTest.java b/luni/src/test/java/tests/SQLite/FunctionContextTest.java
index ef76307..ef76307 100644
--- a/sql/src/test/java/tests/SQLite/FunctionContextTest.java
+++ b/luni/src/test/java/tests/SQLite/FunctionContextTest.java
diff --git a/sql/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java b/luni/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java
index ed2c0b3..ed2c0b3 100644
--- a/sql/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java
+++ b/luni/src/test/java/tests/SQLite/JDBCDriverFunctionalTest.java
diff --git a/sql/src/test/java/tests/SQLite/JDBCDriverTest.java b/luni/src/test/java/tests/SQLite/JDBCDriverTest.java
index 55ab6be..55ab6be 100644
--- a/sql/src/test/java/tests/SQLite/JDBCDriverTest.java
+++ b/luni/src/test/java/tests/SQLite/JDBCDriverTest.java
diff --git a/sql/src/test/java/tests/SQLite/SQLiteTest.java b/luni/src/test/java/tests/SQLite/SQLiteTest.java
index 0463dcb..0463dcb 100644
--- a/sql/src/test/java/tests/SQLite/SQLiteTest.java
+++ b/luni/src/test/java/tests/SQLite/SQLiteTest.java
diff --git a/sql/src/test/java/tests/SQLite/ShellTest.java b/luni/src/test/java/tests/SQLite/ShellTest.java
index 208341c..208341c 100644
--- a/sql/src/test/java/tests/SQLite/ShellTest.java
+++ b/luni/src/test/java/tests/SQLite/ShellTest.java
diff --git a/sql/src/test/java/tests/SQLite/StmtTest.java b/luni/src/test/java/tests/SQLite/StmtTest.java
index 7a37154..7a37154 100644
--- a/sql/src/test/java/tests/SQLite/StmtTest.java
+++ b/luni/src/test/java/tests/SQLite/StmtTest.java
diff --git a/annotation/src/test/java/tests/annotation/AllTests.java b/luni/src/test/java/tests/annotation/AllTests.java
index c95fe26..c95fe26 100644
--- a/annotation/src/test/java/tests/annotation/AllTests.java
+++ b/luni/src/test/java/tests/annotation/AllTests.java
diff --git a/math/src/test/java/tests/api/java/math/AllTests.java b/luni/src/test/java/tests/api/java/math/AllTests.java
index a3fb664..a3fb664 100644
--- a/math/src/test/java/tests/api/java/math/AllTests.java
+++ b/luni/src/test/java/tests/api/java/math/AllTests.java
diff --git a/math/src/test/java/tests/api/java/math/BigDecimalTest.java b/luni/src/test/java/tests/api/java/math/BigDecimalTest.java
index a053cef..a053cef 100644
--- a/math/src/test/java/tests/api/java/math/BigDecimalTest.java
+++ b/luni/src/test/java/tests/api/java/math/BigDecimalTest.java
diff --git a/math/src/test/java/tests/api/java/math/BigIntegerTest.java b/luni/src/test/java/tests/api/java/math/BigIntegerTest.java
index 77eabb4..77eabb4 100644
--- a/math/src/test/java/tests/api/java/math/BigIntegerTest.java
+++ b/luni/src/test/java/tests/api/java/math/BigIntegerTest.java
diff --git a/math/src/test/java/tests/api/java/math/MathContextTest.java b/luni/src/test/java/tests/api/java/math/MathContextTest.java
index dadfd12..dadfd12 100644
--- a/math/src/test/java/tests/api/java/math/MathContextTest.java
+++ b/luni/src/test/java/tests/api/java/math/MathContextTest.java
diff --git a/math/src/test/java/tests/api/java/math/RoundingModeTest.java b/luni/src/test/java/tests/api/java/math/RoundingModeTest.java
index 1549301..1549301 100644
--- a/math/src/test/java/tests/api/java/math/RoundingModeTest.java
+++ b/luni/src/test/java/tests/api/java/math/RoundingModeTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
index 018d017..018d017 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
index a354d65..a354d65 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java
index 4db1d34..4db1d34 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetDecoderTestCase.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java
index 4eb8d4b..4eb8d4b 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetEncoderTestCase.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
index ff6fe42..ff6fe42 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/AllTests.java b/luni/src/test/java/tests/api/java/nio/charset/AllTests.java
index 933f341..933f341 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/AllTests.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/AllTests.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
index 06d7da2..06d7da2 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderDecoderBufferTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderDecoderBufferTest.java
index 5e4c3d0..5e4c3d0 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderDecoderBufferTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderDecoderBufferTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
index ea2cb96..ea2cb96 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
index a2ae12e..a2ae12e 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetProviderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/CharsetTest.java
index 21392af..21392af 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
index 9850959..9850959 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_AbstractTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
index 24a6acb..24a6acb 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_GSM0338.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java
index 8eec28c..8eec28c 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_10.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java
index ade25ae..ade25ae 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_14.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java
index 127eeb4..127eeb4 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_ISO_8859_16.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java
index ef5e0b7..ef5e0b7 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
index 59bfcbc..59bfcbc 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
index 1416d2a..1416d2a 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_Big5_Android.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
index 69a9663..69a9663 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
index 2ebff21..2ebff21 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_JP_Android.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java
index 9c81986..9c81986 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_EUC_KR.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
index 7f83414..7f83414 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GB2312.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
index 2546e58..2546e58 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
index e036607..e036607 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_GBK_Android.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
index bf070c0..bf070c0 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_ISO_2022_JP.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
index 6b71385..6b71385 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java
index 2139061..2139061 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16BE.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java
index 606fcff..606fcff 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16LE.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
index 787deca..787deca 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_16_Android.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java
index 986b8b7..986b8b7 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_UTF_8.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
index 39e7f31..39e7f31 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_MultiByte_x_windows_950.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java
index 38e4256..38e4256 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByteAbstractTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java
index e48b6f4..e48b6f4 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
index 02b6a3b..02b6a3b 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_IBM864.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java
index edfebfb..edfebfb 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_1.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java
index 4f87592..4f87592 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_11.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java
index 254505c..254505c 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_13.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java
index 0b29dd2..0b29dd2 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_15.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java
index 19398ff..19398ff 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_2.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
index 8da07d5..8da07d5 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_3.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java
index 96c7700..96c7700 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_4.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java
index e189bce..e189bce 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_5.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java
index 8f6f564..8f6f564 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_6.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java
index a6cd0cb..a6cd0cb 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_7.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java
index cbbf4ba..cbbf4ba 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_8.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java
index 706463f..706463f 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_ISO_8859_9.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java
index 876db78..876db78 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_KOI8_R.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java
index 428910e..428910e 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_US_ASCII.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java
index 0d2ad51..0d2ad51 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1250.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java
index fbaf6aa..fbaf6aa 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1251.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java
index 9a57516..9a57516 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1252.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java
index e4de9a0..e4de9a0 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1253.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java
index 4a81ae9..4a81ae9 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1254.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java
index 7f77f47..7f77f47 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1255.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java
index 2762016..2762016 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1256.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java
index 4cd64e0..4cd64e0 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1257.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java
index 3fa659f..3fa659f 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_windows_1258.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
index ee2bb21..ee2bb21 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_SingleByte_x_IBM874.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java
index a3b6fbd..a3b6fbd 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java
index a8c89ef..a8c89ef 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_TestGenerator_Res.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java b/luni/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java
index 9f1033f..9f1033f 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/Charset_macintosh.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CoderResultTest.java b/luni/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
index 9fdc84e..9fdc84e 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java b/luni/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
index d9e5bea..d9e5bea 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
index 2f873ac..2f873ac 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
index 249c410..249c410 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
index ee2a189..ee2a189 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
index 6333255..6333255 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
index 41e2d3b..41e2d3b 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
index 4960401..4960401 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
index 04bc9d6..04bc9d6 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
index 0ca8bd3..0ca8bd3 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
index 6c11502..6c11502 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
index 35218e6..35218e6 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
index a0026a1..a0026a1 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
index 607c44f..607c44f 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
index 8963d12..8963d12 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
index 3df7536..3df7536 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
index b9ebbb8..b9ebbb8 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
index 0986d0b..0986d0b 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
diff --git a/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
index 276a6f8..276a6f8 100644
--- a/nio_char/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
+++ b/luni/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
diff --git a/security/src/test/java/tests/api/java/security/AccessControlContextTest.java b/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java
index 9831472..9831472 100644
--- a/security/src/test/java/tests/api/java/security/AccessControlContextTest.java
+++ b/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java
diff --git a/security/src/test/java/tests/api/java/security/AllTests.java b/luni/src/test/java/tests/api/java/security/AllTests.java
index 7f83780..7f83780 100644
--- a/security/src/test/java/tests/api/java/security/AllTests.java
+++ b/luni/src/test/java/tests/api/java/security/AllTests.java
diff --git a/security/src/test/java/tests/api/java/security/DomainCombinerTest.java b/luni/src/test/java/tests/api/java/security/DomainCombinerTest.java
index 7b81cfa..7b81cfa 100644
--- a/security/src/test/java/tests/api/java/security/DomainCombinerTest.java
+++ b/luni/src/test/java/tests/api/java/security/DomainCombinerTest.java
diff --git a/security/src/test/java/tests/api/java/security/PermissionCollectionTest.java b/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java
index 267923a..267923a 100644
--- a/security/src/test/java/tests/api/java/security/PermissionCollectionTest.java
+++ b/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java
index a8db7ad..a8db7ad 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AbstractExecutorServiceTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java
index 9bb206b..9bb206b 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AbstractQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedLongSynchronizerTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AbstractQueuedLongSynchronizerTest.java
index 43a4bd1..43a4bd1 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedLongSynchronizerTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AbstractQueuedLongSynchronizerTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
index a5b6554..a5b6554 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AbstractQueuedSynchronizerTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java
index 8fc5cb6..8fc5cb6 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ArrayBlockingQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayDequeTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ArrayDequeTest.java
index cec1d58..cec1d58 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ArrayDequeTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ArrayDequeTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java
index b2d91b8..b2d91b8 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicBooleanTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java
index 838296d..838296d 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicIntegerArrayTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java
index 383e30b..383e30b 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicIntegerFieldUpdaterTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java
index a2f3b4b..a2f3b4b 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicIntegerTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java
index 88e0984..88e0984 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicLongArrayTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java
index 491baf4..491baf4 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicLongFieldUpdaterTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java
index e73e86e..e73e86e 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicLongTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java
index 72a2337..72a2337 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicMarkableReferenceTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java
index 25f8474..25f8474 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicReferenceArrayTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java
index 78c321e..78c321e 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicReferenceFieldUpdaterTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java
index 5046ee8..5046ee8 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicReferenceTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java b/luni/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java
index ca9b724..ca9b724 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/AtomicStampedReferenceTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java
index 9b355f5..9b355f5 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentHashMapTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java
index 1fbc729..1fbc729 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentLinkedQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListMapTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListMapTest.java
index 3cf5b75..3cf5b75 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListMapTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSetTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSetTest.java
index 2d03b3c..2d03b3c 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSetTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubMapTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubMapTest.java
index fc70935..fc70935 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubMapTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubMapTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubSetTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubSetTest.java
index 9f0a496..9f0a496 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubSetTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ConcurrentSkipListSubSetTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java b/luni/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java
index 90d708a..90d708a 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArrayListTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java b/luni/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java
index c78ac50..c78ac50 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/CopyOnWriteArraySetTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java b/luni/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java
index b06004e..b06004e 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/CountDownLatchTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java b/luni/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java
index b8f8b24..b8f8b24 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/CyclicBarrierTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java
index 7aeceda..7aeceda 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/DelayQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/EntryTest.java b/luni/src/test/java/tests/api/java/util/concurrent/EntryTest.java
index 893fd48..893fd48 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/EntryTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/EntryTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java
index be1eaa3..be1eaa3 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ExchangerTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java
index dfa8f7d..dfa8f7d 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ExecutorCompletionServiceTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java
index f29a712..f29a712 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ExecutorsTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java b/luni/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java
index b1f9f40..b1f9f40 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/FutureTaskTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java b/luni/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
index b764855..b764855 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/JSR166TestCase.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingDequeTest.java b/luni/src/test/java/tests/api/java/util/concurrent/LinkedBlockingDequeTest.java
index a858bb9..a858bb9 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingDequeTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/LinkedBlockingDequeTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java
index a98dc21..a98dc21 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/LinkedBlockingQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java b/luni/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java
index 3017c52..3017c52 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/LinkedListTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java b/luni/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java
index 1052a24..1052a24 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/LockSupportTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java
index f1dd88d..f1dd88d 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/PriorityBlockingQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java
index 12ddef4..12ddef4 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/PriorityQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java
index d6b434e..d6b434e 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ReentrantLockTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java
index eb20255..eb20255 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ReentrantReadWriteLockTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorSubclassTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorSubclassTest.java
index 21f4ced..21f4ced 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorSubclassTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorSubclassTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java
index ff1796e..ff1796e 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ScheduledExecutorTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java b/luni/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java
index c27893c..c27893c 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/SemaphoreTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java b/luni/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java
index 9393c5c..9393c5c 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/SynchronousQueueTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/SystemTest.java b/luni/src/test/java/tests/api/java/util/concurrent/SystemTest.java
index e906186..e906186 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/SystemTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/SystemTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java
index d54bce0..d54bce0 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ThreadLocalTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorSubclassTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorSubclassTest.java
index 911a35f..911a35f 100644
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorSubclassTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorSubclassTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java
index 9b7fcac..9b7fcac 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ThreadPoolExecutorTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadTest.java b/luni/src/test/java/tests/api/java/util/concurrent/ThreadTest.java
index e9f28ac..e9f28ac 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/ThreadTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/ThreadTest.java
diff --git a/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java b/luni/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java
index 84be0c4..84be0c4 100755
--- a/concurrent/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java
+++ b/luni/src/test/java/tests/api/java/util/concurrent/TimeUnitTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/AllTests.java b/luni/src/test/java/tests/api/javax/security/auth/AllTests.java
index bd4ae74..bd4ae74 100644
--- a/security/src/test/java/tests/api/javax/security/auth/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/AllTests.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java b/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java
index 205d90e..205d90e 100644
--- a/security/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
index 7f3c2e0..7f3c2e0 100644
--- a/security/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
index aec2d94..aec2d94 100644
--- a/security/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/DestroyableTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
index 22803d3..22803d3 100644
--- a/security/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
index aedcf63..aedcf63 100644
--- a/security/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
index 29de99a..29de99a 100644
--- a/security/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java b/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java
index 8e45657..8e45657 100644
--- a/security/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java
index 99f6222..99f6222 100644
--- a/security/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/SubjectTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
index 21929bf..21929bf 100644
--- a/security/src/test/java/tests/api/javax/security/auth/SubjectTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
index c99019e..c99019e 100644
--- a/security/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
index 8755ea2..8755ea2 100644
--- a/security/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
+++ b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/AllTests.java b/luni/src/test/java/tests/api/javax/security/cert/AllTests.java
index 30921bd..30921bd 100644
--- a/security/src/test/java/tests/api/javax/security/cert/AllTests.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/AllTests.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
index 1bec4ce..1bec4ce 100644
--- a/security/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
index 6641097..6641097 100644
--- a/security/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
index 83af35c..83af35c 100644
--- a/security/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
index 09fb186..09fb186 100644
--- a/security/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
index c00d0dd..c00d0dd 100644
--- a/security/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
index 38afce6..38afce6 100644
--- a/security/src/test/java/tests/api/javax/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
diff --git a/security/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
index 79b7b00..79b7b00 100644
--- a/security/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
+++ b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
diff --git a/archive/src/test/java/tests/archive/AllTests.java b/luni/src/test/java/tests/archive/AllTests.java
index 4c1fca2..4c1fca2 100644
--- a/archive/src/test/java/tests/archive/AllTests.java
+++ b/luni/src/test/java/tests/archive/AllTests.java
diff --git a/concurrent/src/test/java/tests/concurrent/AllTests.java b/luni/src/test/java/tests/concurrent/AllTests.java
index d599370..d599370 100644
--- a/concurrent/src/test/java/tests/concurrent/AllTests.java
+++ b/luni/src/test/java/tests/concurrent/AllTests.java
diff --git a/crypto/src/test/java/tests/crypto/AllTests.java b/luni/src/test/java/tests/crypto/AllTests.java
index 0b53942..0b53942 100644
--- a/crypto/src/test/java/tests/crypto/AllTests.java
+++ b/luni/src/test/java/tests/crypto/AllTests.java
diff --git a/security/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java b/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java
index 976a9cb..976a9cb 100644
--- a/security/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java
+++ b/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java
diff --git a/security/src/test/java/tests/java/security/AllPermissionTest.java b/luni/src/test/java/tests/java/security/AllPermissionTest.java
index 2db54b0..2db54b0 100644
--- a/security/src/test/java/tests/java/security/AllPermissionTest.java
+++ b/luni/src/test/java/tests/java/security/AllPermissionTest.java
diff --git a/security/src/test/java/tests/java/security/AllTests.java b/luni/src/test/java/tests/java/security/AllTests.java
index 6dadd07..6dadd07 100644
--- a/security/src/test/java/tests/java/security/AllTests.java
+++ b/luni/src/test/java/tests/java/security/AllTests.java
diff --git a/security/src/test/java/tests/java/security/BasicPermissionTest.java b/luni/src/test/java/tests/java/security/BasicPermissionTest.java
index 75661ae..75661ae 100644
--- a/security/src/test/java/tests/java/security/BasicPermissionTest.java
+++ b/luni/src/test/java/tests/java/security/BasicPermissionTest.java
diff --git a/security/src/test/java/tests/java/security/IdentityTest.java b/luni/src/test/java/tests/java/security/IdentityTest.java
index 470936e..470936e 100644
--- a/security/src/test/java/tests/java/security/IdentityTest.java
+++ b/luni/src/test/java/tests/java/security/IdentityTest.java
diff --git a/security/src/test/java/tests/java/security/SecureClassLoaderTest.java b/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
index 6ce1659..6ce1659 100644
--- a/security/src/test/java/tests/java/security/SecureClassLoaderTest.java
+++ b/luni/src/test/java/tests/java/security/SecureClassLoaderTest.java
diff --git a/security/src/test/java/tests/java/security/SecureRandomTest.java b/luni/src/test/java/tests/java/security/SecureRandomTest.java
index 82378d0..82378d0 100644
--- a/security/src/test/java/tests/java/security/SecureRandomTest.java
+++ b/luni/src/test/java/tests/java/security/SecureRandomTest.java
diff --git a/sql/src/test/java/tests/java/sql/AllTests.java b/luni/src/test/java/tests/java/sql/AllTests.java
index 5c9345b..5c9345b 100644
--- a/sql/src/test/java/tests/java/sql/AllTests.java
+++ b/luni/src/test/java/tests/java/sql/AllTests.java
diff --git a/sql/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java
index c03bd6f..c03bd6f 100644
--- a/sql/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java
+++ b/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java
diff --git a/sql/src/test/java/tests/java/sql/DatabaseMetaDataTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
index 65fab06..65fab06 100755
--- a/sql/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
+++ b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java
diff --git a/sql/src/test/java/tests/java/sql/DeleteFunctionalityTest.java b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
index 7c6be0b..7c6be0b 100755
--- a/sql/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java
diff --git a/sql/src/test/java/tests/java/sql/InsertFunctionalityTest.java b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java
index 73e46d0..73e46d0 100755
--- a/sql/src/test/java/tests/java/sql/InsertFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java
diff --git a/sql/src/test/java/tests/java/sql/MultiThreadAccessTest.java b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java
index 3c5f813..3c5f813 100755
--- a/sql/src/test/java/tests/java/sql/MultiThreadAccessTest.java
+++ b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java
diff --git a/sql/src/test/java/tests/java/sql/QueryTimeoutTest.java b/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java
index c6452b5..c6452b5 100644
--- a/sql/src/test/java/tests/java/sql/QueryTimeoutTest.java
+++ b/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java
diff --git a/sql/src/test/java/tests/java/sql/SelectFunctionalityTest.java b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java
index 4f85a3d..4f85a3d 100755
--- a/sql/src/test/java/tests/java/sql/SelectFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java
diff --git a/sql/src/test/java/tests/java/sql/StressTest.java b/luni/src/test/java/tests/java/sql/StressTest.java
index b6d13c1..b6d13c1 100755
--- a/sql/src/test/java/tests/java/sql/StressTest.java
+++ b/luni/src/test/java/tests/java/sql/StressTest.java
diff --git a/sql/src/test/java/tests/java/sql/UpdateFunctionalityTest.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
index bdf8aa8..bdf8aa8 100755
--- a/sql/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
+++ b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java
diff --git a/sql/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
index b681e2f..b681e2f 100755
--- a/sql/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
+++ b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java
diff --git a/sql/src/test/java/tests/javax/sql/ConnectionEventListenerTest.java b/luni/src/test/java/tests/javax/sql/ConnectionEventListenerTest.java
index a89b026..a89b026 100644
--- a/sql/src/test/java/tests/javax/sql/ConnectionEventListenerTest.java
+++ b/luni/src/test/java/tests/javax/sql/ConnectionEventListenerTest.java
diff --git a/sql/src/test/java/tests/javax/sql/ConnectionPoolDataSourceTest.java b/luni/src/test/java/tests/javax/sql/ConnectionPoolDataSourceTest.java
index 7dafc46..7dafc46 100644
--- a/sql/src/test/java/tests/javax/sql/ConnectionPoolDataSourceTest.java
+++ b/luni/src/test/java/tests/javax/sql/ConnectionPoolDataSourceTest.java
diff --git a/sql/src/test/java/tests/javax/sql/DataSourceTest.java b/luni/src/test/java/tests/javax/sql/DataSourceTest.java
index 8aeb666..8aeb666 100644
--- a/sql/src/test/java/tests/javax/sql/DataSourceTest.java
+++ b/luni/src/test/java/tests/javax/sql/DataSourceTest.java
diff --git a/sql/src/test/java/tests/javax/sql/PooledConnectionTest.java b/luni/src/test/java/tests/javax/sql/PooledConnectionTest.java
index 4eb09fb..4eb09fb 100644
--- a/sql/src/test/java/tests/javax/sql/PooledConnectionTest.java
+++ b/luni/src/test/java/tests/javax/sql/PooledConnectionTest.java
diff --git a/sql/src/test/java/tests/javax/sql/RowSetInternalTest.java b/luni/src/test/java/tests/javax/sql/RowSetInternalTest.java
index ff9de34..ff9de34 100644
--- a/sql/src/test/java/tests/javax/sql/RowSetInternalTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetInternalTest.java
diff --git a/sql/src/test/java/tests/javax/sql/RowSetListenerTest.java b/luni/src/test/java/tests/javax/sql/RowSetListenerTest.java
index d238a42..d238a42 100644
--- a/sql/src/test/java/tests/javax/sql/RowSetListenerTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetListenerTest.java
diff --git a/sql/src/test/java/tests/javax/sql/RowSetMetaDataTest.java b/luni/src/test/java/tests/javax/sql/RowSetMetaDataTest.java
index 0a3db18..0a3db18 100644
--- a/sql/src/test/java/tests/javax/sql/RowSetMetaDataTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetMetaDataTest.java
diff --git a/sql/src/test/java/tests/javax/sql/RowSetReaderTest.java b/luni/src/test/java/tests/javax/sql/RowSetReaderTest.java
index 0a24234..0a24234 100644
--- a/sql/src/test/java/tests/javax/sql/RowSetReaderTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetReaderTest.java
diff --git a/sql/src/test/java/tests/javax/sql/RowSetTest.java b/luni/src/test/java/tests/javax/sql/RowSetTest.java
index 3dc2ba7..3dc2ba7 100644
--- a/sql/src/test/java/tests/javax/sql/RowSetTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetTest.java
diff --git a/sql/src/test/java/tests/javax/sql/RowSetWriterTest.java b/luni/src/test/java/tests/javax/sql/RowSetWriterTest.java
index 1b9f972..1b9f972 100644
--- a/sql/src/test/java/tests/javax/sql/RowSetWriterTest.java
+++ b/luni/src/test/java/tests/javax/sql/RowSetWriterTest.java
diff --git a/logging/src/test/java/tests/logging/AllTests.java b/luni/src/test/java/tests/logging/AllTests.java
index aa0cb15..aa0cb15 100644
--- a/logging/src/test/java/tests/logging/AllTests.java
+++ b/luni/src/test/java/tests/logging/AllTests.java
diff --git a/math/src/test/java/tests/math/AllTests.java b/luni/src/test/java/tests/math/AllTests.java
index 64fb60d..64fb60d 100644
--- a/math/src/test/java/tests/math/AllTests.java
+++ b/luni/src/test/java/tests/math/AllTests.java
diff --git a/nio_char/src/test/java/tests/nio_char/AllTests.java b/luni/src/test/java/tests/nio_char/AllTests.java
index 4ab9247..4ab9247 100644
--- a/nio_char/src/test/java/tests/nio_char/AllTests.java
+++ b/luni/src/test/java/tests/nio_char/AllTests.java
diff --git a/regex/src/test/java/tests/regex/AllTests.java b/luni/src/test/java/tests/regex/AllTests.java
index 07feebc..07feebc 100644
--- a/regex/src/test/java/tests/regex/AllTests.java
+++ b/luni/src/test/java/tests/regex/AllTests.java
diff --git a/security/src/test/java/tests/security/AccessControllerTest.java b/luni/src/test/java/tests/security/AccessControllerTest.java
index 0b2b55f..0b2b55f 100644
--- a/security/src/test/java/tests/security/AccessControllerTest.java
+++ b/luni/src/test/java/tests/security/AccessControllerTest.java
diff --git a/security/src/test/java/tests/security/AllTests.java b/luni/src/test/java/tests/security/AllTests.java
index 7a790c9..7a790c9 100644
--- a/security/src/test/java/tests/security/AllTests.java
+++ b/luni/src/test/java/tests/security/AllTests.java
diff --git a/security/src/test/java/tests/security/acl/AclNotFoundException2Test.java b/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java
index c351269..c351269 100644
--- a/security/src/test/java/tests/security/acl/AclNotFoundException2Test.java
+++ b/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java
diff --git a/security/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java b/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java
index cbee130..cbee130 100644
--- a/security/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java
+++ b/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java
diff --git a/security/src/test/java/tests/security/acl/AllTests.java b/luni/src/test/java/tests/security/acl/AllTests.java
index 9a6f2b4..9a6f2b4 100644
--- a/security/src/test/java/tests/security/acl/AllTests.java
+++ b/luni/src/test/java/tests/security/acl/AllTests.java
diff --git a/security/src/test/java/tests/security/acl/IAclEntryTest.java b/luni/src/test/java/tests/security/acl/IAclEntryTest.java
index 94ddf14..94ddf14 100644
--- a/security/src/test/java/tests/security/acl/IAclEntryTest.java
+++ b/luni/src/test/java/tests/security/acl/IAclEntryTest.java
diff --git a/security/src/test/java/tests/security/acl/IAclTest.java b/luni/src/test/java/tests/security/acl/IAclTest.java
index 65cb971..65cb971 100644
--- a/security/src/test/java/tests/security/acl/IAclTest.java
+++ b/luni/src/test/java/tests/security/acl/IAclTest.java
diff --git a/security/src/test/java/tests/security/acl/IGroupTest.java b/luni/src/test/java/tests/security/acl/IGroupTest.java
index 47eac93..47eac93 100644
--- a/security/src/test/java/tests/security/acl/IGroupTest.java
+++ b/luni/src/test/java/tests/security/acl/IGroupTest.java
diff --git a/security/src/test/java/tests/security/acl/IOwnerTest.java b/luni/src/test/java/tests/security/acl/IOwnerTest.java
index 3cb222d..3cb222d 100644
--- a/security/src/test/java/tests/security/acl/IOwnerTest.java
+++ b/luni/src/test/java/tests/security/acl/IOwnerTest.java
diff --git a/security/src/test/java/tests/security/acl/IPermissionTest.java b/luni/src/test/java/tests/security/acl/IPermissionTest.java
index 17cd7a9..17cd7a9 100644
--- a/security/src/test/java/tests/security/acl/IPermissionTest.java
+++ b/luni/src/test/java/tests/security/acl/IPermissionTest.java
diff --git a/security/src/test/java/tests/security/acl/LastOwnerException2Test.java b/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java
index 18c6305..18c6305 100644
--- a/security/src/test/java/tests/security/acl/LastOwnerException2Test.java
+++ b/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java
diff --git a/security/src/test/java/tests/security/acl/LastOwnerExceptionTest.java b/luni/src/test/java/tests/security/acl/LastOwnerExceptionTest.java
index 3cd14ff..3cd14ff 100644
--- a/security/src/test/java/tests/security/acl/LastOwnerExceptionTest.java
+++ b/luni/src/test/java/tests/security/acl/LastOwnerExceptionTest.java
diff --git a/security/src/test/java/tests/security/acl/NotOwnerException2Test.java b/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java
index 87bd277..87bd277 100644
--- a/security/src/test/java/tests/security/acl/NotOwnerException2Test.java
+++ b/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java
diff --git a/security/src/test/java/tests/security/acl/NotOwnerExceptionTest.java b/luni/src/test/java/tests/security/acl/NotOwnerExceptionTest.java
index 67ef38b..67ef38b 100644
--- a/security/src/test/java/tests/security/acl/NotOwnerExceptionTest.java
+++ b/luni/src/test/java/tests/security/acl/NotOwnerExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/AllTests.java b/luni/src/test/java/tests/security/cert/AllTests.java
index e5b9d47..e5b9d47 100644
--- a/security/src/test/java/tests/security/cert/AllTests.java
+++ b/luni/src/test/java/tests/security/cert/AllTests.java
diff --git a/security/src/test/java/tests/security/cert/CRLExceptionTest.java b/luni/src/test/java/tests/security/cert/CRLExceptionTest.java
index 3fc37c0..3fc37c0 100644
--- a/security/src/test/java/tests/security/cert/CRLExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CRLExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CRLTest.java b/luni/src/test/java/tests/security/cert/CRLTest.java
index 8e5693e..8e5693e 100644
--- a/security/src/test/java/tests/security/cert/CRLTest.java
+++ b/luni/src/test/java/tests/security/cert/CRLTest.java
diff --git a/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java b/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java
index d472bc4..d472bc4 100644
--- a/security/src/test/java/tests/security/cert/CertPathBuilder1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java
diff --git a/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java b/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java
index af9de90..af9de90 100644
--- a/security/src/test/java/tests/security/cert/CertPathBuilder2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java
diff --git a/security/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java b/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java
index efd575a..efd575a 100644
--- a/security/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java b/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java
index 751f0c6..751f0c6 100644
--- a/security/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java
diff --git a/security/src/test/java/tests/security/cert/CertPathCertPathRepTest.java b/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java
index 6ca848e..6ca848e 100644
--- a/security/src/test/java/tests/security/cert/CertPathCertPathRepTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java
diff --git a/security/src/test/java/tests/security/cert/CertPathTest.java b/luni/src/test/java/tests/security/cert/CertPathTest.java
index 31ffeee..31ffeee 100644
--- a/security/src/test/java/tests/security/cert/CertPathTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathTest.java
diff --git a/security/src/test/java/tests/security/cert/CertPathValidator1Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java
index 101644d..101644d 100644
--- a/security/src/test/java/tests/security/cert/CertPathValidator1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java
diff --git a/security/src/test/java/tests/security/cert/CertPathValidator2Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator2Test.java
index 3f513cc..3f513cc 100644
--- a/security/src/test/java/tests/security/cert/CertPathValidator2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidator2Test.java
diff --git a/security/src/test/java/tests/security/cert/CertPathValidator3Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java
index b624b25..b624b25 100644
--- a/security/src/test/java/tests/security/cert/CertPathValidator3Test.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java
diff --git a/security/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java b/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java
index c28a761..c28a761 100644
--- a/security/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java b/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java
index 080a112..080a112 100644
--- a/security/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java
diff --git a/security/src/test/java/tests/security/cert/CertStore1Test.java b/luni/src/test/java/tests/security/cert/CertStore1Test.java
index 48c40c9..48c40c9 100644
--- a/security/src/test/java/tests/security/cert/CertStore1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertStore1Test.java
diff --git a/security/src/test/java/tests/security/cert/CertStore2Test.java b/luni/src/test/java/tests/security/cert/CertStore2Test.java
index 4252074..4252074 100644
--- a/security/src/test/java/tests/security/cert/CertStore2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertStore2Test.java
diff --git a/security/src/test/java/tests/security/cert/CertStoreExceptionTest.java b/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java
index 9eddf86..9eddf86 100644
--- a/security/src/test/java/tests/security/cert/CertStoreExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertStoreSpiTest.java b/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java
index 4760871..4760871 100644
--- a/security/src/test/java/tests/security/cert/CertStoreSpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateCertificateRepTest.java b/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java
index 48680a5..48680a5 100644
--- a/security/src/test/java/tests/security/cert/CertificateCertificateRepTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateEncodingException2Test.java b/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java
index 6e83f62..6e83f62 100644
--- a/security/src/test/java/tests/security/cert/CertificateEncodingException2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java
diff --git a/security/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java
index 1792abe..1792abe 100644
--- a/security/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateException2Test.java b/luni/src/test/java/tests/security/cert/CertificateException2Test.java
index 80768c2..80768c2 100644
--- a/security/src/test/java/tests/security/cert/CertificateException2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateException2Test.java
diff --git a/security/src/test/java/tests/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java
index fbd777c..fbd777c 100644
--- a/security/src/test/java/tests/security/cert/CertificateExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java
index 9a7ce5a..9a7ce5a 100644
--- a/security/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateFactory1Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java
index 04112a2..04112a2 100644
--- a/security/src/test/java/tests/security/cert/CertificateFactory1Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java
diff --git a/security/src/test/java/tests/security/cert/CertificateFactory2Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java
index 4350db0..4350db0 100644
--- a/security/src/test/java/tests/security/cert/CertificateFactory2Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java
diff --git a/security/src/test/java/tests/security/cert/CertificateFactory3Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory3Test.java
index 9163933..9163933 100644
--- a/security/src/test/java/tests/security/cert/CertificateFactory3Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory3Test.java
diff --git a/security/src/test/java/tests/security/cert/CertificateFactory4Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java
index 7ab41de..7ab41de 100644
--- a/security/src/test/java/tests/security/cert/CertificateFactory4Test.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java
diff --git a/security/src/test/java/tests/security/cert/CertificateFactorySpiTest.java b/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java
index c985ed4..c985ed4 100644
--- a/security/src/test/java/tests/security/cert/CertificateFactorySpiTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java
index b386387..b386387 100644
--- a/security/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java
index c690b5b..c690b5b 100644
--- a/security/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java
diff --git a/security/src/test/java/tests/security/cert/CertificateTest.java b/luni/src/test/java/tests/security/cert/CertificateTest.java
index 2d0f7e8..2d0f7e8 100644
--- a/security/src/test/java/tests/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/security/cert/CertificateTest.java
diff --git a/security/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
index 551fda6..551fda6 100644
--- a/security/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java
diff --git a/security/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java
index 66d5ad4..66d5ad4 100644
--- a/security/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java
diff --git a/security/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java b/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java
index b3ebcb6..b3ebcb6 100644
--- a/security/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java
diff --git a/security/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java
index 57f7882..57f7882 100644
--- a/security/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java
diff --git a/security/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java
index 6153d5c..6153d5c 100644
--- a/security/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java
diff --git a/security/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java
index e3970ac..e3970ac 100644
--- a/security/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java
diff --git a/security/src/test/java/tests/security/cert/PKIXParametersTest.java b/luni/src/test/java/tests/security/cert/PKIXParametersTest.java
index a8291a9..a8291a9 100644
--- a/security/src/test/java/tests/security/cert/PKIXParametersTest.java
+++ b/luni/src/test/java/tests/security/cert/PKIXParametersTest.java
diff --git a/security/src/test/java/tests/security/cert/PolicyNodeTest.java b/luni/src/test/java/tests/security/cert/PolicyNodeTest.java
index 6c075f9..6c075f9 100644
--- a/security/src/test/java/tests/security/cert/PolicyNodeTest.java
+++ b/luni/src/test/java/tests/security/cert/PolicyNodeTest.java
diff --git a/security/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java b/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java
index be86083..be86083 100644
--- a/security/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java
+++ b/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java
diff --git a/security/src/test/java/tests/security/cert/TrustAnchorTest.java b/luni/src/test/java/tests/security/cert/TrustAnchorTest.java
index 93d596f..93d596f 100644
--- a/security/src/test/java/tests/security/cert/TrustAnchorTest.java
+++ b/luni/src/test/java/tests/security/cert/TrustAnchorTest.java
diff --git a/security/src/test/java/tests/security/cert/X509CRL2Test.java b/luni/src/test/java/tests/security/cert/X509CRL2Test.java
index 4807f5d..4807f5d 100644
--- a/security/src/test/java/tests/security/cert/X509CRL2Test.java
+++ b/luni/src/test/java/tests/security/cert/X509CRL2Test.java
diff --git a/security/src/test/java/tests/security/cert/X509CRLEntryTest.java b/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java
index 3f82f67..3f82f67 100644
--- a/security/src/test/java/tests/security/cert/X509CRLEntryTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java
diff --git a/security/src/test/java/tests/security/cert/X509CRLSelector2Test.java b/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java
index 4dafb52..4dafb52 100644
--- a/security/src/test/java/tests/security/cert/X509CRLSelector2Test.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java
diff --git a/security/src/test/java/tests/security/cert/X509CRLSelectorTest.java b/luni/src/test/java/tests/security/cert/X509CRLSelectorTest.java
index 31faaaf..31faaaf 100644
--- a/security/src/test/java/tests/security/cert/X509CRLSelectorTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLSelectorTest.java
diff --git a/security/src/test/java/tests/security/cert/X509CRLTest.java b/luni/src/test/java/tests/security/cert/X509CRLTest.java
index 4dd98cb..4dd98cb 100644
--- a/security/src/test/java/tests/security/cert/X509CRLTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CRLTest.java
diff --git a/security/src/test/java/tests/security/cert/X509CertSelectorTest.java b/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java
index d334d66..d334d66 100644
--- a/security/src/test/java/tests/security/cert/X509CertSelectorTest.java
+++ b/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java
diff --git a/security/src/test/java/tests/security/cert/X509Certificate2Test.java b/luni/src/test/java/tests/security/cert/X509Certificate2Test.java
index f60ca80..f60ca80 100644
--- a/security/src/test/java/tests/security/cert/X509Certificate2Test.java
+++ b/luni/src/test/java/tests/security/cert/X509Certificate2Test.java
diff --git a/security/src/test/java/tests/security/interfaces/AllTests.java b/luni/src/test/java/tests/security/interfaces/AllTests.java
index e180408..e180408 100644
--- a/security/src/test/java/tests/security/interfaces/AllTests.java
+++ b/luni/src/test/java/tests/security/interfaces/AllTests.java
diff --git a/security/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java b/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java
index 0de893d..0de893d 100644
--- a/security/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java
diff --git a/security/src/test/java/tests/security/interfaces/DSAKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java
index 2a65b64..2a65b64 100644
--- a/security/src/test/java/tests/security/interfaces/DSAKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/DSAParamsTest.java b/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java
index 4a19512..4a19512 100644
--- a/security/src/test/java/tests/security/interfaces/DSAParamsTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java
diff --git a/security/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java
index 3b41a0f..3b41a0f 100644
--- a/security/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java
index 20b769a..20b769a 100644
--- a/security/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/RSAKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java
index dad13db..dad13db 100644
--- a/security/src/test/java/tests/security/interfaces/RSAKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
index d50964a..d50964a 100644
--- a/security/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java
index fb79721..fb79721 100644
--- a/security/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java
index 4e7d616..4e7d616 100644
--- a/security/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java
index 83fbeb2..83fbeb2 100644
--- a/security/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java
+++ b/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java
diff --git a/security/src/test/java/tests/security/interfaces/Util.java b/luni/src/test/java/tests/security/interfaces/Util.java
index 61143a0..61143a0 100644
--- a/security/src/test/java/tests/security/interfaces/Util.java
+++ b/luni/src/test/java/tests/security/interfaces/Util.java
diff --git a/security/src/test/java/tests/security/permissions/AllTests.java b/luni/src/test/java/tests/security/permissions/AllTests.java
index c3d235b..c3d235b 100644
--- a/security/src/test/java/tests/security/permissions/AllTests.java
+++ b/luni/src/test/java/tests/security/permissions/AllTests.java
diff --git a/security/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java
index 36ad29e..36ad29e 100644
--- a/security/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoFileInputStreamTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java
index 78f248d..78f248d 100644
--- a/security/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoFileOutputStreamTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaIoFileTest.java b/luni/src/test/java/tests/security/permissions/JavaIoFileTest.java
index 7bc6933..7bc6933 100644
--- a/security/src/test/java/tests/security/permissions/JavaIoFileTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoFileTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java
index 1fb873f..1fb873f 100644
--- a/security/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoObjectInputStreamTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java b/luni/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java
index 0de39df..0de39df 100644
--- a/security/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoObjectOutputStreamTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java b/luni/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java
index 8201e32..8201e32 100644
--- a/security/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaIoRandomAccessFileTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java b/luni/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java
index c33bb1b..c33bb1b 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangClassLoaderTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaLangClassTest.java b/luni/src/test/java/tests/security/permissions/JavaLangClassTest.java
index f666d44..f666d44 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangClassTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangClassTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java b/luni/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java
index a618546..a618546 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangReflectAccessibleObjectTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java b/luni/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java
index c78f6cc..c78f6cc 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangRuntimeTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java b/luni/src/test/java/tests/security/permissions/JavaLangSystemTest.java
index b9217a1..b9217a1 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangSystemTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangSystemTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaLangThreadTest.java b/luni/src/test/java/tests/security/permissions/JavaLangThreadTest.java
index e71cec0..e71cec0 100644
--- a/security/src/test/java/tests/security/permissions/JavaLangThreadTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaLangThreadTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java
index 714c523..714c523 100644
--- a/security/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetDatagramSocketTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java
index f48e5d3..f48e5d3 100644
--- a/security/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetMulticastSocketTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java
index f26becc..f26becc 100644
--- a/security/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetServerSocketTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaNetSocketTest.java b/luni/src/test/java/tests/security/permissions/JavaNetSocketTest.java
index 3933064..3933064 100644
--- a/security/src/test/java/tests/security/permissions/JavaNetSocketTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaNetSocketTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java b/luni/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java
index c07940e..c07940e 100644
--- a/security/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaSecurityPolicyTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java b/luni/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java
index b935c0d..b935c0d 100644
--- a/security/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java
+++ b/luni/src/test/java/tests/security/permissions/JavaSecuritySecurityTest.java
diff --git a/security/src/test/java/tests/security/permissions/JavaUtilLocale.java b/luni/src/test/java/tests/security/permissions/JavaUtilLocale.java
index 54bee4b..54bee4b 100644
--- a/security/src/test/java/tests/security/permissions/JavaUtilLocale.java
+++ b/luni/src/test/java/tests/security/permissions/JavaUtilLocale.java
diff --git a/security/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java b/luni/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java
index c5c4200..c5c4200 100644
--- a/security/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java
+++ b/luni/src/test/java/tests/security/permissions/JavaUtilZipZipFile.java
diff --git a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java
index 46f52c6..46f52c6 100644
--- a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java
+++ b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubject.java
diff --git a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java
index 8204aa2..8204aa2 100644
--- a/security/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java
+++ b/luni/src/test/java/tests/security/permissions/JavaxSecurityAuthSubjectDomainCombiner.java
diff --git a/security/src/test/java/tests/security/spec/AllTests.java b/luni/src/test/java/tests/security/spec/AllTests.java
index 151e0a7..151e0a7 100644
--- a/security/src/test/java/tests/security/spec/AllTests.java
+++ b/luni/src/test/java/tests/security/spec/AllTests.java
diff --git a/security/src/test/java/tests/security/spec/DSAParameterSpecTest.java b/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java
index 42fce7b..42fce7b 100644
--- a/security/src/test/java/tests/security/spec/DSAParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java
diff --git a/security/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java
index f01e957..f01e957 100644
--- a/security/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java
index 6133836..6133836 100644
--- a/security/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/ECFieldF2mTest.java b/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java
index f731eaa..f731eaa 100644
--- a/security/src/test/java/tests/security/spec/ECFieldF2mTest.java
+++ b/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java
diff --git a/security/src/test/java/tests/security/spec/ECFieldFpTest.java b/luni/src/test/java/tests/security/spec/ECFieldFpTest.java
index 82db1c1..82db1c1 100644
--- a/security/src/test/java/tests/security/spec/ECFieldFpTest.java
+++ b/luni/src/test/java/tests/security/spec/ECFieldFpTest.java
diff --git a/security/src/test/java/tests/security/spec/ECGenParameterSpecTest.java b/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java
index 77747c3..77747c3 100644
--- a/security/src/test/java/tests/security/spec/ECGenParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java
diff --git a/security/src/test/java/tests/security/spec/ECParameterSpecTest.java b/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java
index d970f67..d970f67 100644
--- a/security/src/test/java/tests/security/spec/ECParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java
diff --git a/security/src/test/java/tests/security/spec/ECPointTest.java b/luni/src/test/java/tests/security/spec/ECPointTest.java
index 17856ae..17856ae 100644
--- a/security/src/test/java/tests/security/spec/ECPointTest.java
+++ b/luni/src/test/java/tests/security/spec/ECPointTest.java
diff --git a/security/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java
index e13f7ee..e13f7ee 100644
--- a/security/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/ECPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java
index c74939e..c74939e 100644
--- a/security/src/test/java/tests/security/spec/ECPublicKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/EllipticCurveTest.java b/luni/src/test/java/tests/security/spec/EllipticCurveTest.java
index a8755f3..a8755f3 100644
--- a/security/src/test/java/tests/security/spec/EllipticCurveTest.java
+++ b/luni/src/test/java/tests/security/spec/EllipticCurveTest.java
diff --git a/security/src/test/java/tests/security/spec/EncodedKeySpec2Test.java b/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java
index 344f05e..344f05e 100644
--- a/security/src/test/java/tests/security/spec/EncodedKeySpec2Test.java
+++ b/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java
diff --git a/security/src/test/java/tests/security/spec/EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java
index 16208e4..16208e4 100644
--- a/security/src/test/java/tests/security/spec/EncodedKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java b/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java
index ba3bb49..ba3bb49 100644
--- a/security/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java
+++ b/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java
diff --git a/security/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java b/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java
index b797525..b797525 100644
--- a/security/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java
+++ b/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java
diff --git a/security/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java b/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java
index 2af3be4..2af3be4 100644
--- a/security/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java
diff --git a/security/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java
index 1820d4e..1820d4e 100644
--- a/security/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/PSSParameterSpecTest.java b/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java
index 4525816..4525816 100644
--- a/security/src/test/java/tests/security/spec/PSSParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java
diff --git a/security/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java b/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java
index 4752d39..4752d39 100644
--- a/security/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java
diff --git a/security/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
index 2963458..2963458 100644
--- a/security/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java b/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java
index 8179e75..8179e75 100644
--- a/security/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java
diff --git a/security/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java
index 5f4b6c4..5f4b6c4 100644
--- a/security/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java
index 207c173..207c173 100644
--- a/security/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java
index 08f852c..08f852c 100644
--- a/security/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java
diff --git a/security/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java
index 8942b89..8942b89 100644
--- a/security/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java
+++ b/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java
diff --git a/security/src/test/java/tests/security/special-test-cases.txt b/luni/src/test/java/tests/security/special-test-cases.txt
index 2bf4a21..2bf4a21 100644
--- a/security/src/test/java/tests/security/special-test-cases.txt
+++ b/luni/src/test/java/tests/security/special-test-cases.txt
diff --git a/sql/src/test/java/tests/sql/AllTests.java b/luni/src/test/java/tests/sql/AllTests.java
index 6eda690..6eda690 100644
--- a/sql/src/test/java/tests/sql/AllTests.java
+++ b/luni/src/test/java/tests/sql/AllTests.java
diff --git a/sql/src/test/java/tests/sql/ArrayTest.java b/luni/src/test/java/tests/sql/ArrayTest.java
index f3b49d6..f3b49d6 100644
--- a/sql/src/test/java/tests/sql/ArrayTest.java
+++ b/luni/src/test/java/tests/sql/ArrayTest.java
diff --git a/sql/src/test/java/tests/sql/BlobTest.java b/luni/src/test/java/tests/sql/BlobTest.java
index 43fb2a6..43fb2a6 100644
--- a/sql/src/test/java/tests/sql/BlobTest.java
+++ b/luni/src/test/java/tests/sql/BlobTest.java
diff --git a/sql/src/test/java/tests/sql/CallableStatementTest.java b/luni/src/test/java/tests/sql/CallableStatementTest.java
index db7aca1..db7aca1 100644
--- a/sql/src/test/java/tests/sql/CallableStatementTest.java
+++ b/luni/src/test/java/tests/sql/CallableStatementTest.java
diff --git a/sql/src/test/java/tests/sql/ClobTest.java b/luni/src/test/java/tests/sql/ClobTest.java
index c0f218f..c0f218f 100644
--- a/sql/src/test/java/tests/sql/ClobTest.java
+++ b/luni/src/test/java/tests/sql/ClobTest.java
diff --git a/sql/src/test/java/tests/sql/ConnectionTest.java b/luni/src/test/java/tests/sql/ConnectionTest.java
index c718108..c718108 100755
--- a/sql/src/test/java/tests/sql/ConnectionTest.java
+++ b/luni/src/test/java/tests/sql/ConnectionTest.java
diff --git a/sql/src/test/java/tests/sql/ParameterMetaDataTest.java b/luni/src/test/java/tests/sql/ParameterMetaDataTest.java
index f522450..f522450 100644
--- a/sql/src/test/java/tests/sql/ParameterMetaDataTest.java
+++ b/luni/src/test/java/tests/sql/ParameterMetaDataTest.java
diff --git a/sql/src/test/java/tests/sql/PreparedStatementTest.java b/luni/src/test/java/tests/sql/PreparedStatementTest.java
index 1546d38..1546d38 100755
--- a/sql/src/test/java/tests/sql/PreparedStatementTest.java
+++ b/luni/src/test/java/tests/sql/PreparedStatementTest.java
diff --git a/sql/src/test/java/tests/sql/RefTest.java b/luni/src/test/java/tests/sql/RefTest.java
index 6109623..6109623 100644
--- a/sql/src/test/java/tests/sql/RefTest.java
+++ b/luni/src/test/java/tests/sql/RefTest.java
diff --git a/sql/src/test/java/tests/sql/ResultSetGetterTests.java b/luni/src/test/java/tests/sql/ResultSetGetterTests.java
index fccfd94..fccfd94 100644
--- a/sql/src/test/java/tests/sql/ResultSetGetterTests.java
+++ b/luni/src/test/java/tests/sql/ResultSetGetterTests.java
diff --git a/sql/src/test/java/tests/sql/ResultSetMetaDataTest.java b/luni/src/test/java/tests/sql/ResultSetMetaDataTest.java
index 67adfd9..67adfd9 100755
--- a/sql/src/test/java/tests/sql/ResultSetMetaDataTest.java
+++ b/luni/src/test/java/tests/sql/ResultSetMetaDataTest.java
diff --git a/sql/src/test/java/tests/sql/ResultSetNotSupportedTests.java b/luni/src/test/java/tests/sql/ResultSetNotSupportedTests.java
index 1009d94..1009d94 100644
--- a/sql/src/test/java/tests/sql/ResultSetNotSupportedTests.java
+++ b/luni/src/test/java/tests/sql/ResultSetNotSupportedTests.java
diff --git a/sql/src/test/java/tests/sql/ResultSetTest.java b/luni/src/test/java/tests/sql/ResultSetTest.java
index 5b6d74a..5b6d74a 100644
--- a/sql/src/test/java/tests/sql/ResultSetTest.java
+++ b/luni/src/test/java/tests/sql/ResultSetTest.java
diff --git a/sql/src/test/java/tests/sql/SQLDataTest.java b/luni/src/test/java/tests/sql/SQLDataTest.java
index 1aed820..1aed820 100644
--- a/sql/src/test/java/tests/sql/SQLDataTest.java
+++ b/luni/src/test/java/tests/sql/SQLDataTest.java
diff --git a/sql/src/test/java/tests/sql/SQLInputTest.java b/luni/src/test/java/tests/sql/SQLInputTest.java
index 818818b..818818b 100644
--- a/sql/src/test/java/tests/sql/SQLInputTest.java
+++ b/luni/src/test/java/tests/sql/SQLInputTest.java
diff --git a/sql/src/test/java/tests/sql/SQLOutputTest.java b/luni/src/test/java/tests/sql/SQLOutputTest.java
index 13ef4b1..13ef4b1 100644
--- a/sql/src/test/java/tests/sql/SQLOutputTest.java
+++ b/luni/src/test/java/tests/sql/SQLOutputTest.java
diff --git a/sql/src/test/java/tests/sql/SQLTest.java b/luni/src/test/java/tests/sql/SQLTest.java
index b0719c2..b0719c2 100755
--- a/sql/src/test/java/tests/sql/SQLTest.java
+++ b/luni/src/test/java/tests/sql/SQLTest.java
diff --git a/sql/src/test/java/tests/sql/SavepointTest.java b/luni/src/test/java/tests/sql/SavepointTest.java
index dedf032..dedf032 100644
--- a/sql/src/test/java/tests/sql/SavepointTest.java
+++ b/luni/src/test/java/tests/sql/SavepointTest.java
diff --git a/sql/src/test/java/tests/sql/StatementTest.java b/luni/src/test/java/tests/sql/StatementTest.java
index 55bd7ab..55bd7ab 100755
--- a/sql/src/test/java/tests/sql/StatementTest.java
+++ b/luni/src/test/java/tests/sql/StatementTest.java
diff --git a/sql/src/test/java/tests/sql/StructTest.java b/luni/src/test/java/tests/sql/StructTest.java
index 91f18a5..91f18a5 100644
--- a/sql/src/test/java/tests/sql/StructTest.java
+++ b/luni/src/test/java/tests/sql/StructTest.java
diff --git a/suncompat/src/test/java/tests/suncompat/AllTests.java b/luni/src/test/java/tests/suncompat/AllTests.java
index e86889c..e86889c 100644
--- a/suncompat/src/test/java/tests/suncompat/AllTests.java
+++ b/luni/src/test/java/tests/suncompat/AllTests.java
diff --git a/sql/src/test/java/tests/support/DatabaseCreator.java b/luni/src/test/java/tests/support/DatabaseCreator.java
index 12744dd..12744dd 100755
--- a/sql/src/test/java/tests/support/DatabaseCreator.java
+++ b/luni/src/test/java/tests/support/DatabaseCreator.java
diff --git a/sql/src/test/java/tests/support/MockCallback.java b/luni/src/test/java/tests/support/MockCallback.java
index c605c38..c605c38 100644
--- a/sql/src/test/java/tests/support/MockCallback.java
+++ b/luni/src/test/java/tests/support/MockCallback.java
diff --git a/sql/src/test/java/tests/support/MockFunction.java b/luni/src/test/java/tests/support/MockFunction.java
index de4e9f5..de4e9f5 100644
--- a/sql/src/test/java/tests/support/MockFunction.java
+++ b/luni/src/test/java/tests/support/MockFunction.java
diff --git a/sql/src/test/java/tests/support/Support_SQL.java b/luni/src/test/java/tests/support/Support_SQL.java
index 1f63f15..1f63f15 100644
--- a/sql/src/test/java/tests/support/Support_SQL.java
+++ b/luni/src/test/java/tests/support/Support_SQL.java
diff --git a/sql/src/test/java/tests/support/ThreadPool.java b/luni/src/test/java/tests/support/ThreadPool.java
index 6e82f25..6e82f25 100644
--- a/sql/src/test/java/tests/support/ThreadPool.java
+++ b/luni/src/test/java/tests/support/ThreadPool.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java
index 530e5ec..530e5ec 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTest.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestAES.java b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestAES.java
index 12da153..12da153 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestAES.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestAES.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDH.java b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDH.java
index 7999b92..7999b92 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDH.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDH.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java
index a0f4b72..a0f4b72 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParameterGeneratorTestDSA.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTest.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTest.java
index 02f2691..02f2691 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTest.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTest.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java
index 9bdf6c6..9bdf6c6 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestAES.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java
index 9aed7c1..9aed7c1 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDES.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java
index 9163825..9163825 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDESede.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java
index 8943c62..8943c62 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDH.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDSA.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDSA.java
index 046e62f..046e62f 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTestDSA.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestDSA.java
diff --git a/security/src/test/java/tests/targets/security/AlgorithmParametersTestOAEP.java b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestOAEP.java
index 2e0e253..2e0e253 100644
--- a/security/src/test/java/tests/targets/security/AlgorithmParametersTestOAEP.java
+++ b/luni/src/test/java/tests/targets/security/AlgorithmParametersTestOAEP.java
diff --git a/security/src/test/java/tests/targets/security/AllTests.java b/luni/src/test/java/tests/targets/security/AllTests.java
index 7d5802d..7d5802d 100644
--- a/security/src/test/java/tests/targets/security/AllTests.java
+++ b/luni/src/test/java/tests/targets/security/AllTests.java
diff --git a/security/src/test/java/tests/targets/security/CipherHelper.java b/luni/src/test/java/tests/targets/security/CipherHelper.java
index 1ab5b34..1ab5b34 100644
--- a/security/src/test/java/tests/targets/security/CipherHelper.java
+++ b/luni/src/test/java/tests/targets/security/CipherHelper.java
diff --git a/security/src/test/java/tests/targets/security/DHTest.java b/luni/src/test/java/tests/targets/security/DHTest.java
index 3f5adc1..3f5adc1 100644
--- a/security/src/test/java/tests/targets/security/DHTest.java
+++ b/luni/src/test/java/tests/targets/security/DHTest.java
diff --git a/security/src/test/java/tests/targets/security/DefaultKeys.java b/luni/src/test/java/tests/targets/security/DefaultKeys.java
index a517d9c..a517d9c 100644
--- a/security/src/test/java/tests/targets/security/DefaultKeys.java
+++ b/luni/src/test/java/tests/targets/security/DefaultKeys.java
diff --git a/security/src/test/java/tests/targets/security/KeyFactoryTest.java b/luni/src/test/java/tests/targets/security/KeyFactoryTest.java
index e66e293..e66e293 100644
--- a/security/src/test/java/tests/targets/security/KeyFactoryTest.java
+++ b/luni/src/test/java/tests/targets/security/KeyFactoryTest.java
diff --git a/security/src/test/java/tests/targets/security/KeyFactoryTestDH.java b/luni/src/test/java/tests/targets/security/KeyFactoryTestDH.java
index e18967c..e18967c 100644
--- a/security/src/test/java/tests/targets/security/KeyFactoryTestDH.java
+++ b/luni/src/test/java/tests/targets/security/KeyFactoryTestDH.java
diff --git a/security/src/test/java/tests/targets/security/KeyFactoryTestDSA.java b/luni/src/test/java/tests/targets/security/KeyFactoryTestDSA.java
index dccb3b9..dccb3b9 100644
--- a/security/src/test/java/tests/targets/security/KeyFactoryTestDSA.java
+++ b/luni/src/test/java/tests/targets/security/KeyFactoryTestDSA.java
diff --git a/security/src/test/java/tests/targets/security/KeyFactoryTestRSA.java b/luni/src/test/java/tests/targets/security/KeyFactoryTestRSA.java
index f984d6d..f984d6d 100644
--- a/security/src/test/java/tests/targets/security/KeyFactoryTestRSA.java
+++ b/luni/src/test/java/tests/targets/security/KeyFactoryTestRSA.java
diff --git a/security/src/test/java/tests/targets/security/KeyPairGeneratorTest.java b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTest.java
index 9e7cd0c..9e7cd0c 100644
--- a/security/src/test/java/tests/targets/security/KeyPairGeneratorTest.java
+++ b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTest.java
diff --git a/security/src/test/java/tests/targets/security/KeyPairGeneratorTestDH.java b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTestDH.java
index 2c32d21..2c32d21 100644
--- a/security/src/test/java/tests/targets/security/KeyPairGeneratorTestDH.java
+++ b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTestDH.java
diff --git a/security/src/test/java/tests/targets/security/KeyPairGeneratorTestDSA.java b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTestDSA.java
index 251468b..251468b 100644
--- a/security/src/test/java/tests/targets/security/KeyPairGeneratorTestDSA.java
+++ b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTestDSA.java
diff --git a/security/src/test/java/tests/targets/security/KeyPairGeneratorTestRSA.java b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTestRSA.java
index 6ca875f..6ca875f 100644
--- a/security/src/test/java/tests/targets/security/KeyPairGeneratorTestRSA.java
+++ b/luni/src/test/java/tests/targets/security/KeyPairGeneratorTestRSA.java
diff --git a/security/src/test/java/tests/targets/security/KeyStoreTest.java b/luni/src/test/java/tests/targets/security/KeyStoreTest.java
index 2db3ad6..2db3ad6 100644
--- a/security/src/test/java/tests/targets/security/KeyStoreTest.java
+++ b/luni/src/test/java/tests/targets/security/KeyStoreTest.java
diff --git a/security/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java b/luni/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java
index fe24ba7..fe24ba7 100644
--- a/security/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java
+++ b/luni/src/test/java/tests/targets/security/KeyStoreTestPKCS12.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTest.java b/luni/src/test/java/tests/targets/security/MessageDigestTest.java
index 05f9fc7..05f9fc7 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTest.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTest.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestMD2.java b/luni/src/test/java/tests/targets/security/MessageDigestTestMD2.java
index 0086af4..0086af4 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestMD2.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestMD2.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestMD5.java b/luni/src/test/java/tests/targets/security/MessageDigestTestMD5.java
index 1908339..1908339 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestMD5.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestMD5.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA1.java b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA1.java
index e5967c3..e5967c3 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA1.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA1.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA224.java b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA224.java
index c7e0d10..c7e0d10 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA224.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA224.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA256.java b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA256.java
index 0ccd59e..0ccd59e 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA256.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA256.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA384.java b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA384.java
index ca5feef..ca5feef 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA384.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA384.java
diff --git a/security/src/test/java/tests/targets/security/MessageDigestTestSHA512.java b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA512.java
index 9d8e0f0..9d8e0f0 100644
--- a/security/src/test/java/tests/targets/security/MessageDigestTestSHA512.java
+++ b/luni/src/test/java/tests/targets/security/MessageDigestTestSHA512.java
diff --git a/security/src/test/java/tests/targets/security/SecureRandomTest.java b/luni/src/test/java/tests/targets/security/SecureRandomTest.java
index 981c979..981c979 100644
--- a/security/src/test/java/tests/targets/security/SecureRandomTest.java
+++ b/luni/src/test/java/tests/targets/security/SecureRandomTest.java
diff --git a/security/src/test/java/tests/targets/security/SecureRandomTestSHA1PRNG.java b/luni/src/test/java/tests/targets/security/SecureRandomTestSHA1PRNG.java
index 6690b38..6690b38 100644
--- a/security/src/test/java/tests/targets/security/SecureRandomTestSHA1PRNG.java
+++ b/luni/src/test/java/tests/targets/security/SecureRandomTestSHA1PRNG.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTest.java b/luni/src/test/java/tests/targets/security/SignatureTest.java
index 55748fb..55748fb 100644
--- a/security/src/test/java/tests/targets/security/SignatureTest.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTest.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java
index ab83ad9..ab83ad9 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestMD5withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestMD5withRSA.java
index 1a71dbe..1a71dbe 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestMD5withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestMD5withRSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestNONEwithDSA.java b/luni/src/test/java/tests/targets/security/SignatureTestNONEwithDSA.java
index d07fa49..d07fa49 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestNONEwithDSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestNONEwithDSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestSHA1withDSA.java b/luni/src/test/java/tests/targets/security/SignatureTestSHA1withDSA.java
index 85cc068..85cc068 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestSHA1withDSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestSHA1withDSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestSHA1withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestSHA1withRSA.java
index dffa6a6..dffa6a6 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestSHA1withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestSHA1withRSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestSHA224withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestSHA224withRSA.java
index 1c73a85..1c73a85 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestSHA224withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestSHA224withRSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestSHA256withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestSHA256withRSA.java
index 08ca2e5..08ca2e5 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestSHA256withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestSHA256withRSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestSHA384withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestSHA384withRSA.java
index f102a5e..f102a5e 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestSHA384withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestSHA384withRSA.java
diff --git a/security/src/test/java/tests/targets/security/SignatureTestSHA512withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestSHA512withRSA.java
index e956b24..e956b24 100644
--- a/security/src/test/java/tests/targets/security/SignatureTestSHA512withRSA.java
+++ b/luni/src/test/java/tests/targets/security/SignatureTestSHA512withRSA.java
diff --git a/security/src/test/java/tests/targets/security/cert/AllTests.java b/luni/src/test/java/tests/targets/security/cert/AllTests.java
index c0c411d..c0c411d 100644
--- a/security/src/test/java/tests/targets/security/cert/AllTests.java
+++ b/luni/src/test/java/tests/targets/security/cert/AllTests.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java b/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java
index d242ced..d242ced 100644
--- a/security/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTest.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertPathBuilderTestPKIX.java b/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTestPKIX.java
index 4b10805..4b10805 100644
--- a/security/src/test/java/tests/targets/security/cert/CertPathBuilderTestPKIX.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertPathBuilderTestPKIX.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertPathValidatorTest.java b/luni/src/test/java/tests/targets/security/cert/CertPathValidatorTest.java
index db5942d..db5942d 100644
--- a/security/src/test/java/tests/targets/security/cert/CertPathValidatorTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertPathValidatorTest.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertPathValidatorTestPKIX.java b/luni/src/test/java/tests/targets/security/cert/CertPathValidatorTestPKIX.java
index b14fe3a..b14fe3a 100644
--- a/security/src/test/java/tests/targets/security/cert/CertPathValidatorTestPKIX.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertPathValidatorTestPKIX.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertificateFactoryTest.java b/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTest.java
index a5d7a46..a5d7a46 100644
--- a/security/src/test/java/tests/targets/security/cert/CertificateFactoryTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTest.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java b/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java
index 8c9c5d6..8c9c5d6 100644
--- a/security/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertificateFactoryTestX509.java
diff --git a/security/src/test/java/tests/targets/security/cert/CertificateTest.java b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
index 114dcfe..114dcfe 100644
--- a/security/src/test/java/tests/targets/security/cert/CertificateTest.java
+++ b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java
diff --git a/text/src/test/java/tests/text/AllTests.java b/luni/src/test/java/tests/text/AllTests.java
index 25066fb..25066fb 100644
--- a/text/src/test/java/tests/text/AllTests.java
+++ b/luni/src/test/java/tests/text/AllTests.java
diff --git a/security/src/test/resources/PolicyTest.txt b/luni/src/test/resources/PolicyTest.txt
index b765919..b765919 100644
--- a/security/src/test/resources/PolicyTest.txt
+++ b/luni/src/test/resources/PolicyTest.txt
diff --git a/sql/src/test/resources/blob.c b/luni/src/test/resources/blob.c
index 9ea1ed7..9ea1ed7 100644
--- a/sql/src/test/resources/blob.c
+++ b/luni/src/test/resources/blob.c
diff --git a/logging/src/test/resources/bundles/java/util/logging/res.properties b/luni/src/test/resources/bundles/java/util/logging/res.properties
index db455b0..db455b0 100644
--- a/logging/src/test/resources/bundles/java/util/logging/res.properties
+++ b/luni/src/test/resources/bundles/java/util/logging/res.properties
diff --git a/logging/src/test/resources/bundles/java/util/logging/res2.properties b/luni/src/test/resources/bundles/java/util/logging/res2.properties
index 66f02eb..66f02eb 100644
--- a/logging/src/test/resources/bundles/java/util/logging/res2.properties
+++ b/luni/src/test/resources/bundles/java/util/logging/res2.properties
diff --git a/logging/src/test/resources/bundles/java/util/logging/res3.properties b/luni/src/test/resources/bundles/java/util/logging/res3.properties
index f7b4b29..f7b4b29 100644
--- a/logging/src/test/resources/bundles/java/util/logging/res3.properties
+++ b/luni/src/test/resources/bundles/java/util/logging/res3.properties
diff --git a/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties b/luni/src/test/resources/bundles/java/util/logging/res_en_US.properties
index db455b0..db455b0 100644
--- a/logging/src/test/resources/bundles/java/util/logging/res_en_US.properties
+++ b/luni/src/test/resources/bundles/java/util/logging/res_en_US.properties
diff --git a/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties b/luni/src/test/resources/bundles/java/util/logging/res_zh_CN.properties
index e96803d..e96803d 100644
--- a/logging/src/test/resources/bundles/java/util/logging/res_zh_CN.properties
+++ b/luni/src/test/resources/bundles/java/util/logging/res_zh_CN.properties
diff --git a/logging/src/test/resources/config/java/util/logging/logging.config b/luni/src/test/resources/config/java/util/logging/logging.config
index 6e7394b..6e7394b 100644
--- a/logging/src/test/resources/config/java/util/logging/logging.config
+++ b/luni/src/test/resources/config/java/util/logging/logging.config
diff --git a/logging/src/test/resources/config/java/util/logging/logging.properties b/luni/src/test/resources/config/java/util/logging/logging.properties
index f4c5146..f4c5146 100644
--- a/logging/src/test/resources/config/java/util/logging/logging.properties
+++ b/luni/src/test/resources/config/java/util/logging/logging.properties
diff --git a/sql/src/test/resources/connection.properties b/luni/src/test/resources/connection.properties
index d514e85..d514e85 100644
--- a/sql/src/test/resources/connection.properties
+++ b/luni/src/test/resources/connection.properties
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.ciphertext b/luni/src/test/resources/hyts_des-ede3-cbc.test1.ciphertext
index 2d7b94b..2d7b94b 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.ciphertext
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test1.ciphertext
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.iv b/luni/src/test/resources/hyts_des-ede3-cbc.test1.iv
index 401f335..401f335 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.iv
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test1.iv
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.key b/luni/src/test/resources/hyts_des-ede3-cbc.test1.key
index 2ffb5ea..2ffb5ea 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.key
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test1.key
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext b/luni/src/test/resources/hyts_des-ede3-cbc.test1.plaintext
index 9787ee2..9787ee2 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test1.plaintext
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test1.plaintext
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.ciphertext b/luni/src/test/resources/hyts_des-ede3-cbc.test2.ciphertext
index 1ae3f96..1ae3f96 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.ciphertext
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test2.ciphertext
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.iv b/luni/src/test/resources/hyts_des-ede3-cbc.test2.iv
index 72660fc..72660fc 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.iv
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test2.iv
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.key b/luni/src/test/resources/hyts_des-ede3-cbc.test2.key
index 9876f3f..9876f3f 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.key
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test2.key
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.plaintext b/luni/src/test/resources/hyts_des-ede3-cbc.test2.plaintext
index 1b5ef4a..1b5ef4a 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test2.plaintext
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test2.plaintext
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.ciphertext b/luni/src/test/resources/hyts_des-ede3-cbc.test3.ciphertext
index b9dd600..b9dd600 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.ciphertext
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test3.ciphertext
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.iv b/luni/src/test/resources/hyts_des-ede3-cbc.test3.iv
index 7a6ded5..7a6ded5 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.iv
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test3.iv
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.key b/luni/src/test/resources/hyts_des-ede3-cbc.test3.key
index e18fd89..e18fd89 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.key
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test3.key
diff --git a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.plaintext b/luni/src/test/resources/hyts_des-ede3-cbc.test3.plaintext
index f45bd88..f45bd88 100644
--- a/crypto/src/test/resources/hyts_des-ede3-cbc.test3.plaintext
+++ b/luni/src/test/resources/hyts_des-ede3-cbc.test3.plaintext
diff --git a/nio_char/src/test/resources/jars/charset_provider.jar b/luni/src/test/resources/jars/charset_provider.jar
index f1230d9..f1230d9 100644
--- a/nio_char/src/test/resources/jars/charset_provider.jar
+++ b/luni/src/test/resources/jars/charset_provider.jar
diff --git a/text/src/test/resources/serialization/java/text/DecimalFormat.ser b/luni/src/test/resources/serialization/java/text/DecimalFormat.ser
index c20fa78..c20fa78 100644
--- a/text/src/test/resources/serialization/java/text/DecimalFormat.ser
+++ b/luni/src/test/resources/serialization/java/text/DecimalFormat.ser
diff --git a/text/src/test/resources/serialization/java/text/DecimalFormatSymbols.ser b/luni/src/test/resources/serialization/java/text/DecimalFormatSymbols.ser
index 6e086af..6e086af 100644
--- a/text/src/test/resources/serialization/java/text/DecimalFormatSymbols.ser
+++ b/luni/src/test/resources/serialization/java/text/DecimalFormatSymbols.ser
diff --git a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser
index 721a368..721a368 100644
--- a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LevelTest.golden.ser
diff --git a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser
index 955c6fb..955c6fb 100644
--- a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LogRecordTest.golden.ser
diff --git a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.golden.ser
index f4cdced..f4cdced 100644
--- a/logging/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/logging/tests/java/util/logging/LoggingPermissionTest.golden.ser
diff --git a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser
index a95c4e4..a95c4e4 100644
--- a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser
diff --git a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser
index 6f4a4e3..6f4a4e3 100644
--- a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser
diff --git a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser
index 59e4d0b..59e4d0b 100644
--- a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser
diff --git a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser
index e2f0dec..e2f0dec 100644
--- a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser
diff --git a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser
index 7933fb9..7933fb9 100644
--- a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser
diff --git a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser
index 07c63bb..07c63bb 100644
--- a/nio_char/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser
diff --git a/regex/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.golden.ser
index 623d6ac..623d6ac 100755
--- a/regex/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.golden.ser
diff --git a/regex/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternTest.golden.ser
index 6150adf..6150adf 100755
--- a/regex/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/regex/tests/java/util/regex/PatternTest.golden.ser
diff --git a/security/src/test/resources/serialization/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.golden.ser
index 931ee3f..931ee3f 100755
--- a/security/src/test/resources/serialization/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser
index d20eed1..d20eed1 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser
index 9ecd6e1..9ecd6e1 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
index 6e58660..6e58660 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser
index be37cb8..be37cb8 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser
index 4e51a0a..4e51a0a 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/java/sql/TimestampTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser
index 642e2fc..642e2fc 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.golden.ser
index edd8bee..edd8bee 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.golden.ser
diff --git a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.golden.ser
index 71ed471..71ed471 100644
--- a/sql/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.golden.ser
+++ b/luni/src/test/resources/serialization/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.golden.ser
diff --git a/security/src/test/resources/serialization/tests/security/cert/CertPathTest.golden.ser b/luni/src/test/resources/serialization/tests/security/cert/CertPathTest.golden.ser
index c3407ad..c3407ad 100644
--- a/security/src/test/resources/serialization/tests/security/cert/CertPathTest.golden.ser
+++ b/luni/src/test/resources/serialization/tests/security/cert/CertPathTest.golden.ser
diff --git a/security/src/test/resources/serialization/tests/security/cert/CertificateTest.golden.ser b/luni/src/test/resources/serialization/tests/security/cert/CertificateTest.golden.ser
index b5bc9e0..b5bc9e0 100644
--- a/security/src/test/resources/serialization/tests/security/cert/CertificateTest.golden.ser
+++ b/luni/src/test/resources/serialization/tests/security/cert/CertificateTest.golden.ser
diff --git a/security/src/test/resources/tests/resources/hyts_badpem.cer b/luni/src/test/resources/tests/resources/hyts_badpem.cer
index cc663de..cc663de 100644
--- a/security/src/test/resources/tests/resources/hyts_badpem.cer
+++ b/luni/src/test/resources/tests/resources/hyts_badpem.cer
diff --git a/security/src/test/resources/tests/resources/java/security/cert/CertPath.PkiPath b/luni/src/test/resources/tests/resources/java/security/cert/CertPath.PkiPath
index 7d415c0..7d415c0 100644
--- a/security/src/test/resources/tests/resources/java/security/cert/CertPath.PkiPath
+++ b/luni/src/test/resources/tests/resources/java/security/cert/CertPath.PkiPath
diff --git a/security/src/test/resources/tests/resources/testdex.jar b/luni/src/test/resources/tests/resources/testdex.jar
index e8a90d4..e8a90d4 100644
--- a/security/src/test/resources/tests/resources/testdex.jar
+++ b/luni/src/test/resources/tests/resources/testdex.jar
diff --git a/security/src/test/resources/tests/targets/security/MD5.check b/luni/src/test/resources/tests/targets/security/MD5.check
index b36b510..b36b510 100644
--- a/security/src/test/resources/tests/targets/security/MD5.check
+++ b/luni/src/test/resources/tests/targets/security/MD5.check
diff --git a/security/src/test/resources/tests/targets/security/MD5.data b/luni/src/test/resources/tests/targets/security/MD5.data
index 39be11d..39be11d 100644
--- a/security/src/test/resources/tests/targets/security/MD5.data
+++ b/luni/src/test/resources/tests/targets/security/MD5.data
diff --git a/security/src/test/resources/tests/targets/security/SHA-1.check b/luni/src/test/resources/tests/targets/security/SHA-1.check
index 9cc20ad..9cc20ad 100644
--- a/security/src/test/resources/tests/targets/security/SHA-1.check
+++ b/luni/src/test/resources/tests/targets/security/SHA-1.check
diff --git a/security/src/test/resources/tests/targets/security/SHA-1.data b/luni/src/test/resources/tests/targets/security/SHA-1.data
index 39be11d..39be11d 100644
--- a/security/src/test/resources/tests/targets/security/SHA-1.data
+++ b/luni/src/test/resources/tests/targets/security/SHA-1.data
diff --git a/security/src/test/resources/tests/targets/security/SHA-224.check b/luni/src/test/resources/tests/targets/security/SHA-224.check
index a7aaf15..a7aaf15 100644
--- a/security/src/test/resources/tests/targets/security/SHA-224.check
+++ b/luni/src/test/resources/tests/targets/security/SHA-224.check
diff --git a/security/src/test/resources/tests/targets/security/SHA-224.data b/luni/src/test/resources/tests/targets/security/SHA-224.data
index 39be11d..39be11d 100644
--- a/security/src/test/resources/tests/targets/security/SHA-224.data
+++ b/luni/src/test/resources/tests/targets/security/SHA-224.data
diff --git a/security/src/test/resources/tests/targets/security/SHA-256.check b/luni/src/test/resources/tests/targets/security/SHA-256.check
index 3c3e1fa..3c3e1fa 100644
--- a/security/src/test/resources/tests/targets/security/SHA-256.check
+++ b/luni/src/test/resources/tests/targets/security/SHA-256.check
diff --git a/security/src/test/resources/tests/targets/security/SHA-256.data b/luni/src/test/resources/tests/targets/security/SHA-256.data
index 39be11d..39be11d 100644
--- a/security/src/test/resources/tests/targets/security/SHA-256.data
+++ b/luni/src/test/resources/tests/targets/security/SHA-256.data
diff --git a/security/src/test/resources/tests/targets/security/SHA-384.check b/luni/src/test/resources/tests/targets/security/SHA-384.check
index 8bf622e..8bf622e 100644
--- a/security/src/test/resources/tests/targets/security/SHA-384.check
+++ b/luni/src/test/resources/tests/targets/security/SHA-384.check
diff --git a/security/src/test/resources/tests/targets/security/SHA-384.data b/luni/src/test/resources/tests/targets/security/SHA-384.data
index 39be11d..39be11d 100644
--- a/security/src/test/resources/tests/targets/security/SHA-384.data
+++ b/luni/src/test/resources/tests/targets/security/SHA-384.data
diff --git a/security/src/test/resources/tests/targets/security/SHA-512.check b/luni/src/test/resources/tests/targets/security/SHA-512.check
index 54792fe..54792fe 100644
--- a/security/src/test/resources/tests/targets/security/SHA-512.check
+++ b/luni/src/test/resources/tests/targets/security/SHA-512.check
diff --git a/security/src/test/resources/tests/targets/security/SHA-512.data b/luni/src/test/resources/tests/targets/security/SHA-512.data
index 39be11d..39be11d 100644
--- a/security/src/test/resources/tests/targets/security/SHA-512.data
+++ b/luni/src/test/resources/tests/targets/security/SHA-512.data
diff --git a/math/MODULE_LICENSE_APACHE2 b/math/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/math/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/nio_char/MODULE_LICENSE_APACHE2 b/nio_char/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/nio_char/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/regex/MODULE_LICENSE_APACHE2 b/regex/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/regex/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/security/MODULE_LICENSE_APACHE2 b/security/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e0940a1..0000000
--- a/security/MODULE_LICENSE_APACHE2
+++ /dev/null
@@ -1 +0,0 @@
-For Harmony code
diff --git a/sql/MODULE_LICENSE_APACHE2 b/sql/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/sql/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/suncompat/MODULE_LICENSE_APACHE2 b/suncompat/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/suncompat/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/text/MODULE_LICENSE_APACHE2 b/text/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/text/MODULE_LICENSE_APACHE2
+++ /dev/null
author	Peter Hallam <peterhal@google.com>	2010-04-26 12:53:37 -0700
committer	Peter Hallam <peterhal@google.com>	2010-04-27 16:26:27 -0700
commit	cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd (patch)
tree	e71d43da21749bfeb4524b0adec05c91d1f89a5f
parent	f205f06be1ce65f132be1b7c850675086f26c0f7 (diff)
download	libcore-cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd.zip libcore-cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd.tar.gz libcore-cec4dd4b1d33f78997603d0f89c0d0e56e64dbcd.tar.bz2