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

* commit '0ddbc6c215c34f708fcc898be25ddffc18282881':
  CleanSpec for 08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
This commit is contained in:
Narayan Kamath 2014-01-31 16:41:27 +00:00 committed by Android Git Automerger
commit 966611a9c2
1 changed files with 4 additions and 0 deletions

View File

@ -217,6 +217,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
# ************************************************