commit 6f16857720d78975877db6dbd09f59a080b167a1
author Elliott Hughes <enh@google.com> Wed Jul 31 15:49:04 2013 -0700
committer Elliott Hughes <enh@google.com> Wed Jul 31 15:49:04 2013 -0700
tree f8b283775c90d3e947c7ed0e2484544416a66796
parent 172f5f57460001b78e100cefa584d8e91738e48a
parent 8714c8316492156ae0e23d0bd27f8824da443c86

resolved conflicts for merge of 8714c831 to master

Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 5118481..c58d9fd 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -60,9 +60,6 @@
     wpa_supplicant
 
 PRODUCT_PACKAGES += \
-    icu.dat
-
-PRODUCT_PACKAGES += \
     librs_jni \
     libvideoeditor_jni \
     libvideoeditor_core \

target/product/mini.mk

diff --git a/target/product/mini.mk b/target/product/mini.mk
index ae8f408..ef21789 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -85,7 +85,6 @@
     ext \
     framework-res \
     hprof-conv \
-    icu.dat \
     installd \
     ip \
     ip-up-vpn \
@@ -170,10 +169,6 @@
     hostapd \
     wpa_supplicant.conf
 
-
-PRODUCT_PACKAGES += \
-    icu.dat
-
 PRODUCT_PACKAGES += \
     librs_jni \
     libvideoeditor_jni \