From 45fc4139737340151b88d35dbda0dcf4a389604f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 May 2013 17:18:17 -0700 Subject: [PATCH 1/2] JWR51B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 3eac4e4df2..07c670b3e3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR51 +export BUILD_ID=JWR51B From 73e32267c0edd3c7f3a892c5a36317f70139caa6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 May 2013 05:56:16 -0700 Subject: [PATCH 2/2] "JWR52" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7be..ba0574753f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR52