Merge "Merge tag 'android-5.0.2_r1' into merge_branch"
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f348692..a1dec2e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -299,6 +299,12 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
+# 5.0.1
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
+# 5.0.2
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/build_id.mk b/core/build_id.mk
index 78bb105..1ade542 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
# (like "CRB01"). It must be a single word, and is
# capitalized by convention.
-export BUILD_ID=LRX21M
+export BUILD_ID=LRX22G
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 8cb8d26..abfa072 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.0
+ PLATFORM_VERSION := 5.0.2
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"