From 476750c763788ad27d183946b210fe2b54eb05b0 Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Mon, 19 Nov 2012 16:03:54 -0800
Subject: [PATCH 1/2] JOP40D

---
 core/build_id.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 0713d42cbe..bebcbfa77d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -19,4 +19,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=JOP40C
+export BUILD_ID=JOP40D

From d4382dd07eda339743aecd02c911431ffcdfff87 Mon Sep 17 00:00:00 2001
From: Ed Heyl <edheyl@google.com>
Date: Mon, 19 Nov 2012 14:20:48 -0800
Subject: [PATCH 2/2] bump version to 4.2.1

Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
---
 core/version_defaults.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 1162b7826d..fb1f361d44 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)"
   # 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)"