commit f7306051c160edc22cf32da09eca310ff0e18177
author Ed Heyl <edheyl@google.com> Mon Nov 19 14:29:37 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 19 14:29:37 2012 -0800
tree 3e5b70ec6c80c8d4e5e53233d7b6d08cf5ca1c73
parent 287d1e42b48d74d3cba1d362d6379cd5ddcd0de4
parent 0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792

am 0ddeb0cc: am efcc8b1c: bump version to 4.2.1

* commit '0ddeb0ccc1d6dbbb21f9c6d7262d629c3cb8a792':
  bump version to 4.2.1

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1162b78..fb1f361 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.1
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"