Merge "resolved conflicts for merge of 084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp

This commit is contained in:
Narayan Kamath
2014-01-31 12:33:12 +00:00
committed by Android (Google) Code Review

View File

@@ -211,6 +211,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# 4.4.2
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# "L" and beyond.
# Make libart the default runtime
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************