Merge branch 'froyo' into froyo-release

This commit is contained in:
The Android Automerger 2010-04-05 08:02:49 -07:00
commit 98bcd7120d
1 changed files with 2 additions and 1 deletions

View File

@ -21,6 +21,7 @@ PRODUCT_PACKAGES := \
AlarmClock \ AlarmClock \
Camera \ Camera \
Calculator \ Calculator \
CarHome \
Development \ Development \
DrmProvider \ DrmProvider \
Email \ Email \
@ -51,7 +52,7 @@ PRODUCT_PACKAGES := \
PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
PRODUCT_COPY_FILES := \ PRODUCT_COPY_FILES := \
development/data/etc/vold.conf:system/etc/vold.conf \ system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \
frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)