commit c3868ae37130a6c1c1a650d78bc26f394439d796
author Bart Sears <bsears@google.com> Thu Mar 26 18:03:17 2015 -0700
committer Bart Sears <bsears@google.com> Thu Mar 26 18:03:17 2015 -0700
tree 4b39d60b44bd57c6df77cb5bd786ff50a95aea7b
parent 1c10f0757294d5d46c2e4d8b17da230715897ba6
parent 6d607ee7b0983c5a96895e39c292c2f0e957af29

resolved conflicts for merge of 6d607ee7 to lmp-mr1-dev-plus-aosp

Change-Id: I0a49bf5492cd5c1b03cf8cddd219db326d586909

CleanSpec.mk

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
 # ************************************************

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d87a032..cc63286 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@
   # which is the version that we reveal to the end user.
   # Update this value when the platform version changes (rather
   # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 5.1
+  PLATFORM_VERSION := 5.1.1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"