From: The Android Automerger <android-build@android.com>
Date: Fri, 22 Feb 2013 15:51:28 +0000 (-0800)
Subject: AAQ53
X-Git-Tag: android-x86-6.0-r1~1204^2~658^2~2^2~3^2~2^2~5^2~2^2~2^2~2^2~4^2~3^2~6^2~2^2~2^2~3^2~3^2~2^2~2^2~2^2~4^2~3^2~2^2~2^2~3^2~2^2~5^2~1^2~1^2~4^2~5^2~1^2~2^2~1^2~2^2~2^2~5^2~1^2~1^2~3^2~1^2~1^2~1^2~1^2~1^2~3^2~2^2~1^2~1^2~1^2~1^2~2^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~2^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~2^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~1^2~2^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=2793b28e6a1927a70b476d61b9bff5b7d8cb3cdc;p=android-x86%2Fbuild.git

AAQ53
---

diff --git a/core/build_id.mk b/core/build_id.mk
index 40bb35dd3..37fc5466b 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=AAQ53