commit dad03bf1852b46b78d4f780bae61cbbfe2ebbb81
author Neil Fuller <nfuller@google.com> Fri Apr 24 11:11:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 24 11:11:14 2015 +0000
tree 3555b783a88e5359d9873d4645fdb5e20a30213e
parent f2953dadbb99431a7d97854f6f21dbc8c761f4d3
parent a921fa0fc354fed48d29822109c573a124a95dfd

am a921fa0f: am ff1e7e01: am 0e29681f: Merge "Load ICU4J data on boot"

* commit 'a921fa0fc354fed48d29822109c573a124a95dfd':
  Load ICU4J data on boot

preloaded-classes

diff --git a/preloaded-classes b/preloaded-classes
index 86bd5c9..95d0b42 100644
--- a/preloaded-classes
+++ b/preloaded-classes
@@ -828,6 +828,11 @@
 android.hardware.usb.UsbDevice
 android.hardware.usb.UsbDeviceConnection
 android.hardware.usb.UsbRequest
+# Initializing android.icu.impl.ICUBinary loads the ICU data.
+# Opening the files in the Zygote avoids StrictMode violations.
+# It also ensures the ICU data files are mapped on boot and all
+# apps will be consistent (even if files are added to /data).
+android.icu.impl.ICUBinary
 android.inputmethodservice.ExtractEditText
 android.location.Location
 android.location.Location$1