Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d
Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
diff --git a/preloaded-classes b/preloaded-classes
index b602039..1d5fbc08 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -697,19 +697,13 @@
com.ibm.icu4jni.charset.CharsetDecoderICU
com.ibm.icu4jni.charset.CharsetEncoderICU
com.ibm.icu4jni.charset.CharsetICU
-com.ibm.icu4jni.charset.CharsetProviderICU
com.ibm.icu4jni.charset.NativeConverter
com.ibm.icu4jni.common.ErrorCode
-com.ibm.icu4jni.lang.UCharacter
-com.ibm.icu4jni.regex.NativeRegEx
com.ibm.icu4jni.text.Collator
com.ibm.icu4jni.text.NativeBreakIterator
com.ibm.icu4jni.text.NativeCollation
com.ibm.icu4jni.text.NativeDecimalFormat
com.ibm.icu4jni.text.RuleBasedCollator
-com.ibm.icu4jni.text.RuleBasedNumberFormat
-com.ibm.icu4jni.util.Resources
-com.ibm.icu4jni.util.Resources$DefaultTimeZones
dalvik.system.DalvikLogHandler
dalvik.system.DalvikLogging
dalvik.system.NativeStart
@@ -758,7 +752,6 @@
java.io.PrintWriter
java.io.PushbackReader
java.io.RandomAccessFile
-java.io.RandomAccessFile$RepositionLock
java.io.Reader
java.io.Serializable
java.io.StreamCorruptedException
@@ -853,6 +846,7 @@
java.math.BigInt
java.math.BigInteger
java.math.Multiplication
+java.math.NativeBN
java.net.AddressCache
java.net.AddressCache$1
java.net.ConnectException
@@ -930,7 +924,6 @@
java.security.cert.X509Certificate
java.text.AttributedCharacterIterator$Attribute
java.text.Collator
-java.text.Collator$1
java.text.DateFormat
java.text.DateFormat$Field
java.text.DecimalFormat
@@ -1126,7 +1119,6 @@
org.apache.harmony.luni.util.InputStreamHelper$1
org.apache.harmony.luni.util.InputStreamHelper$ExposedByteArrayInputStream
org.apache.harmony.luni.util.LocaleCache
-org.apache.harmony.luni.util.Msg
org.apache.harmony.luni.util.NumberConverter
org.apache.harmony.luni.util.PriviAction
org.apache.harmony.luni.util.ThreadLocalCache
@@ -1178,7 +1170,6 @@
org.apache.harmony.security.x509.TBSCertificate
org.apache.harmony.security.x509.Time
org.apache.harmony.security.x509.Validity
-org.apache.harmony.text.BidiWrapper
org.apache.harmony.xml.ExpatAttributes
org.apache.harmony.xml.ExpatParser
org.apache.harmony.xml.ExpatPullParser
@@ -1260,7 +1251,6 @@
org.json.JSONObject
org.kxml2.io.KXmlParser
org.kxml2.io.KXmlSerializer
-org.openssl.NativeBN
org.xml.sax.Attributes
org.xml.sax.InputSource
org.xml.sax.helpers.AttributesImpl