commit fb28a3a4e51542e7f52b98cb5f69522181b8b8ed
author Jean-Baptiste Queru <jbq@google.com> Mon Dec 03 15:05:25 2012 -0800
committer Jean-Baptiste Queru <jbq@google.com> Mon Dec 03 15:05:25 2012 -0800
tree e95441b8a39fb756ca4e49e9a7e17188c01fdcf9
parent 04fc926d1e9817166485014c9505c99cd7ce9982
parent 0f4e3718dff489f25ff5d6a1431a37a18bef52f4

resolved conflicts for merge of 0f4e3718 to master

Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8

core/version_defaults.mk

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