resolved conflicts for merge of 8714c831 to master

Change-Id: I58a6ab217aeaa5de099a9d79d1830c833f718a9d
2013-07-31 15:49:04 -07:00 · 2013-07-31 15:49:04 -07:00 · 6f16857720
parent 172f5f5746 8714c83164
commit 6f16857720
2 changed files with 0 additions and 8 deletions
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@ -59,9 +59,6 @@ PRODUCT_PACKAGES += \
    sdptool \
    wpa_supplicant

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

-
-PRODUCT_PACKAGES += \
-    icu.dat
-
 PRODUCT_PACKAGES += \
    librs_jni \
    libvideoeditor_jni \