am 7f96f4f6: am 4c710cbe: DO NOT MERGE - Backport of ag/748221 - Security Patch Level...

* commit '7f96f4f6b95de53bd4aaff762885050ad7c4a7be':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3

diff --cc CleanSpec.mk
index 744a862,a7bc1e0..4f0459e
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -211,16 -211,15 +211,19 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  # 4.4.2
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
  
 -# 4.4.3
 +# KKWT development
  $(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/*)
  
 -# 4.4.4
 +# 4.4.4 (KKWT)
  $(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/*)
  
+ # Added new build props
+ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+ 
  # ************************************************
  # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
  # ************************************************

diff --cc core/Makefile
Simple merge

diff --cc core/version_defaults.mk
Simple merge