resolved conflicts for merge of ebc32090 to lmp-mr1-dev-plus-aosp

Change-Id: Icfa9c3424a2e75a07eaa453663b03a12897809a9
This commit is contained in:
Dan Albert 2014-11-07 14:20:57 -08:00
commit 420773ae53
1 changed files with 3 additions and 0 deletions

View File

@ -307,6 +307,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
# Move to libc++ as the default STL.
$(call add-clean-step, rm -rf $(OUT_DIR))
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************