StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 343597c3 to jb-dev-plus-aosp

Browse Source 
Change-Id: I84648a8044e6238a57b4a08a261146bfa3c8c1c7
This commit is contained in:
Jean-Baptiste Queru
2012-05-02 15:22:34 -07:00
parent 9bdc290792 343597c3aa
commit 5af27de0b5
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/product/sdk.mk
View File

@@ -86,6 +86,7 @@ PRODUCT_COPY_FILES := \
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)