resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp

Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35
This commit is contained in:
David 'Digit' Turner 2011-07-11 20:20:12 +02:00
commit 36331f8455
1 changed files with 1 additions and 0 deletions

View File

@ -58,6 +58,7 @@ files_to_copy += \
$(BUILT_SYSTEMIMAGE):images/$(TARGET_CPU_ABI)/system.img \
$(BUILT_USERDATAIMAGE_TARGET):images/$(TARGET_CPU_ABI)/userdata.img \
$(BUILT_RAMDISK_TARGET):images/$(TARGET_CPU_ABI)/ramdisk.img \
$(ANDROID_PRODUCT_OUT)/system/build.prop:images/$(TARGET_CPU_ABI)/build.prop \
$(target_notice_file_txt):images/$(TARGET_CPU_ABI)/NOTICE.txt
# Generate rules to copy the requested files