resolved conflicts for merge of 636458dd to eclair-mr2

2009-11-24 14:58:54 -08:00
parent 7e39fc2351 636458dd06
commit 69ed23d097
1 changed files with 1 additions and 0 deletions
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -118,6 +118,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/GoogleSubscribedFeedsProvider.apk)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)

 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST