resolved conflicts for merge of 636458dd to eclair-mr2

diff --cc cleanspec.mk
index 5867665,40b62e0..75f58d5
--- 1/cleanspec.mk
--- 2/cleanspec.mk
+++ b/cleanspec.mk
@@@ -117,7 -105,7 +117,8 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  $(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