resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp
Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909
diff --git a/CleanSpec.mk b/CleanSpec.mk
index edf0179..334b7d8 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -349,6 +349,12 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
+# 5.1.1!
+$(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/*)
+
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************