resolved conflicts for merge of 882ad42e to eclair-mr2

Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587

diff --cc cleanspec.mk
index 02c36d1,4b88868..5674df0
--- 1/cleanspec.mk
--- 2/cleanspec.mk
+++ b/cleanspec.mk
@@@ -117,13 -105,8 +117,14 @@@ $(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)
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
 +$(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 $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates)
  
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST