summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuang Zhu <guangzhu@google.com>2012-10-12 17:06:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-12 17:06:21 -0700
commit0f23979f29db6b46978b78da4db90df862ffb925 (patch)
treef9fb6795d3c87cb78529efd1a80271f96ed04053
parent6a44471c3b295190125a8ba33a02ec8db3a6aba9 (diff)
parent18daa1750ba31b510d07d0f65e8e8007ed90b902 (diff)
downloadbuild-0f23979f29db6b46978b78da4db90df862ffb925.zip
build-0f23979f29db6b46978b78da4db90df862ffb925.tar.gz
build-0f23979f29db6b46978b78da4db90df862ffb925.tar.bz2
am 18daa175: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
* commit '18daa1750ba31b510d07d0f65e8e8007ed90b902': DO NOT MERGE: better late than never: fix build id for JB MR1
-rw-r--r--core/build_id.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 40bb35d..cfff307 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -23,7 +23,7 @@
# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
#
-BUILD_ID := MASTER
+BUILD_ID := JB_MR1
# DISPLAY_BUILD_NUMBER should only be set for development branches,
# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for