From: The Android Automerger <android-build@android.com>
Date: Fri, 6 May 2011 14:56:24 +0000 (-0700)
Subject: HTJ36
X-Git-Tag: android-x86-4.4-r1~1772^5~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b9e7e6c7bf804283002581afb731f4ca322d8c2d;p=android-x86%2Fbuild.git

HTJ36

Change-Id: Idcf387b729e2e6c9091ff4e1325a4a5f73866317
---

diff --git a/core/build_id.mk b/core/build_id.mk
index 40bb35dd3..885c31a30 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=HTJ36