resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp
Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 8f29b8c..ec1e28c 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -86,6 +86,7 @@
development/tools/emulator/system/camera/media_codecs.xml:system/etc/media_codecs.xml \
frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
frameworks/native/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
+ frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)