resolved conflicts for merge of 882ad42e to eclair-mr2

Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587
This commit is contained in:
Mike Lockwood
2009-12-07 10:52:22 -05:00

View File

@@ -124,6 +124,7 @@ $(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