resolved conflicts for merge of 2f2882a0 to master

Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
This commit is contained in:
David 'Digit' Turner 2011-09-23 11:44:29 +02:00
commit becc3da915
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 \
$(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