From 886cfbff0efda28b79d0c438a5ac41ee2f63e7ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 18 Nov 2011 22:02:22 -0800 Subject: [PATCH 1/4] ICL49B --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6da16e053..b563492df 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 := ICS_MR0 -# 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=ICL49B From 0d2a077ab0fd8d21698284919197536b9029c262 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Nov 2011 13:08:17 -0800 Subject: [PATCH 2/4] ICL52 --- core/build_id.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 6da16e053..1d7e966d0 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 := ICS_MR0 -# 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=ICL52 From eb3f2c1c0836fa4a1cac9553e27a56ab5d730d0e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Nov 2011 13:41:52 -0800 Subject: [PATCH 3/4] ITL41E --- 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 13e2b7d77..6036eefd8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=ITL41D +export BUILD_ID=ITL41E From 3538ad9af25ddf7001ad2305df01f87d8ec8c09a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Nov 2011 17:40:35 -0800 Subject: [PATCH 4/4] ITL41F --- 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 6036eefd8..58c7e4074 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=ITL41E +export BUILD_ID=ITL41F