commit e1e63b3c1ac922886b6d9b2ec649ad2457cc134a
author Steve Kondik <shade@chemlab.org> Thu Jan 26 07:51:54 2012 +0300
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Thu Jan 26 07:51:54 2012 +0300
tree 552630d08816d7ea830838b24bd497284f2bfecc
parent 407b399e5e954b1767b51aa46a63027fd6125839
parent 23e02eb7e6b614c4e93b539a401c81bf8561b43e

Merge "add tenderloin device" into ics

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 278fcee..7ae8247 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -42,7 +42,11 @@
     vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
     vendor/cm/proprietary/Term.apk:system/app/Term.apk \
     vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm3.so:system/lib/libjackpal-androidterm3.so \
-    vendor/cm/prebuilt/common/bootanimation.zip:system/media/bootanimation.zip \
+    vendor/cm/prebuilt/common/bootanimation.zip:system/media/bootanimation.zip
+
+# Bring in camera effects & videos
+$(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
+PRODUCT_COPY_FILES +=  \
     vendor/cm/prebuilt/common/media/LMprec_508.emd:system/media/LMprec_508.emd \
     vendor/cm/prebuilt/common/media/PFFprec_600.emd:system/media/PFFprec_600.emd