commit 3395c88f4491f9e9ca2a7ca36a8a999b78f0f9e7
author Qiwen Zhao <zhao@google.com> Fri Dec 05 20:29:34 2014 -0800
committer Qiwen Zhao <zhao@google.com> Fri Dec 05 20:29:34 2014 -0800
tree 1375c1995f453964ca3f020f81a1235b8324a7dc
parent 69b8c4f9314e6c48dde64a234b2f4b25500abb36
parent aaf823d23c9d3fa1d6b1fd513d07f6fd14f6ea2c

Merge commit 'aaf823d2' into lmp-mr1-dev-plus-aosp

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index d5206bb..fc908de 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -320,6 +320,11 @@
 # an ABI change since the names will mangle differently.
 $(call add-clean-step, rm -rf $(OUT_DIR))
 
+# 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/*)
+
 # ************************************************
 # 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 1acc320..d87a032 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 := LollipopMR1
+  PLATFORM_VERSION := 5.1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"