From: The Android Automerger <android-build@android.com>
Date: Sat, 21 Jan 2012 00:15:22 +0000 (-0800)
Subject: IMM20
X-Git-Tag: android-x86-4.4-r1~1120^2~61^2~1
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fbuild.git;a=commitdiff_plain;h=5cb3f9d271785d9adc457eaf584a7a89a6f017d5

IMM20
---

diff --git a/core/build_id.mk b/core/build_id.mk
index 70bd2351c..135b2701e 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 := MR1
 
-# 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=IMM20