am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level...

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

diff --cc CleanSpec.mk
index e706b9c,3724e37..e9d4455
--- 1/CleanSpec.mk
--- 2/CleanSpec.mk
+++ b/CleanSpec.mk
@@@ -299,21 -299,15 +299,24 @@@ $(call add-clean-step, rm -rf $(PRODUCT
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
  $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
  
 -# 5.0.1
 +# API 22!
  $(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/*)
 +
 +# 5.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/*)
  
 -# 5.0.2
 +# 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/*)
  
+ # 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

diff --cc tools/buildinfo.sh
Simple merge