commit d2e4c25e3f102249758915da7c24c47782df003b
author Dianne Hackborn <hackbod@google.com> Mon Dec 03 14:26:03 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 14:26:03 2012 -0800
tree f9beaa65b77e9a8ce91d636cf0e8bbc1eb3c1d4c
parent 7bfd28d74468845b5d2ef0db7753ef1e0075a575
parent b7157909185968064db922bff6d7b1baabe305f4

am b7157909: Merge "Obviously JB MR1.1 should be Android 4.2.2." into jb-mr1.1-dev

* commit 'b7157909185968064db922bff6d7b1baabe305f4':
  Obviously JB MR1.1 should be Android 4.2.2.

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index f4d45ff..59b7d68 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -150,6 +150,8 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 
+$(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 fb1f361..e3ba14f 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 := 4.2.1
+  PLATFORM_VERSION := 4.2.2
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"