resolved conflicts for merge of 0a694f4c to master

Change-Id: Idec6e6837c6329dae423a12fc084a11bca82463d
2014-04-25 09:28:00 -07:00 · 2014-04-25 09:28:00 -07:00 · 8d4562a14d
commit 8d4562a14d
parent 6ee3c4327d 0a694f4c57
2 changed files with 1 additions and 2 deletions
--- a/target/product/base.mk
+++ b/target/product/base.mk
@ -52,7 +52,6 @@ PRODUCT_PACKAGES += \
    libinput \
    libinputflinger \
    libiprouteutil \
-    libjni_latinime \
    libjnigraphics \
    libldnhncr \
    libmedia \
@ -61,7 +60,6 @@ PRODUCT_PACKAGES += \
    libmtp \
    libnetlink \
    libnetutils \
-    libpac \
    libreference-ril \
    libreverbwrapper \
    libril \
--- a/target/product/core.mk
+++ b/target/product/core.mk
@ -42,6 +42,7 @@ PRODUCT_PACKAGES += \
    ManagedProvisioning \
    PicoTts \
    PacProcessor \
+    libpac \
    PrintSpooler \
    ProxyHandler \
    QuickSearchBox \