commit 0f23979f29db6b46978b78da4db90df862ffb925
author Guang Zhu <guangzhu@google.com> Fri Oct 12 17:06:21 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 12 17:06:21 2012 -0700
tree f9fb6795d3c87cb78529efd1a80271f96ed04053
parent 6a44471c3b295190125a8ba33a02ec8db3a6aba9
parent 18daa1750ba31b510d07d0f65e8e8007ed90b902

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

core/build_id.mk

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