From cab8934f9d699e14814179b91310c723068a75af Mon Sep 17 00:00:00 2001
From: The Android Automerger <android-build@android.com>
Date: Tue, 19 Jun 2012 07:10:41 -0700
Subject: [PATCH] JRN80

---
 core/build_id.mk | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/core/build_id.mk b/core/build_id.mk
index 40bb35dd39..b96b6a2ea2 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,3 +1,4 @@
+
 #
 # Copyright (C) 2008 The Android Open Source Project
 #
@@ -13,20 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-#
-# Defines branch-specific values.
-#
-
 # BUILD_ID is usually used to specify the branch name
 # (like "MAIN") or a branch name and a release candidate
-# (like "TC1-RC5").  It must be a single word, and is
+# (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
-#
-BUILD_ID := MASTER
 
-# DISPLAY_BUILD_NUMBER should only be set for development branches,
-# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
-# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
-# is the same as BUILD_ID
-DISPLAY_BUILD_NUMBER := true
+export BUILD_ID=JRN80