commit 2ff97d99266623997c09f5af937f98bc8bb2ee65
author Jeff Arneson <jarneson@google.com> Thu Dec 18 17:00:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 18 17:00:15 2014 +0000
tree 14ace8017be83d9ba268d2eb9cd8348baf81f808
parent 351c908b757fcfee03d5f15b4a29cb9a48f93f46
parent d194c6ac80007532596a614c86e3c68e129957e7

am d194c6ac: Merge "Fix Documentation typo when showAnnotations is used with doclava" into lmp-docs

* commit 'd194c6ac80007532596a614c86e3c68e129957e7':
  Fix Documentation typo when showAnnotations is used with doclava

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index ca66178..a1dec2e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -302,6 +302,9 @@
 # 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
 # ************************************************

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 36e4e98..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.1
+  PLATFORM_VERSION := 5.0.2
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"