resolved conflicts for merge of 222a835d to master

Change-Id: I82b1f9338eadaed07dc803e56682f4bbb2a97fc3
This commit is contained in:
Ying Wang
2010-10-07 15:24:44 -07:00

View File

@@ -54,6 +54,8 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/android-info.txt)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST