resolved conflicts for merge of 5836d3b3 to jb-mr1-dev
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
diff --git a/target/product/mini.mk b/target/product/mini.mk
index 668bf89..e3fc1b7 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -51,6 +51,7 @@
ro.config.notification_sound=OnTheHunt.ogg \
ro.config.alarm_alert=Alarm_Classic.ogg
+# Please keep this list sorted alphabetically
PRODUCT_PACKAGES += \
ApplicationsProvider \
ContactsProvider \
@@ -64,6 +65,8 @@
UserDictionaryProvider \
abcc \
apache-xml \
+ audio \
+ bluetoothd \
bouncycastle \
bu \
cacerts \
@@ -81,6 +84,7 @@
dx \
ext \
framework-res \
+ hciattach \
hprof-conv \
icu.dat \
installd \
@@ -138,13 +142,17 @@
libwebrtc_audio_preprocessing \
libwilhelm \
libz \
+ lint \
mdnsd \
+ mms-common \
+ network \
+ pand \
requestsync \
screencap \
+ sdptool \
sensorservice \
- lint \
telephony-common \
- mms-common
+ wpa_supplicant
PRODUCT_COPY_FILES += \
system/core/rootdir/init.usb.rc:root/init.usb.rc \
@@ -211,6 +219,7 @@
ro.config.ringtone=Ring_Synth_04.ogg \
ro.config.notification_sound=pixiedust.ogg
+$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage5.mk)