From 0754c0b3503ec207eaa3265ce2212d822a0ee167 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Nov 2011 20:54:15 -0700 Subject: [PATCH 1/5] ITL33C --- 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..134fadd84 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=ITL33C From 7ce887dba3e588b433dda438377c0753f5bc5bde Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Nov 2011 21:22:44 -0700 Subject: [PATCH 2/5] ITL33D --- 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 134fadd84..6d0099e41 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=ITL33C +export BUILD_ID=ITL33D From b618db48397d6bd5b772adb20fa42057a7e24447 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Nov 2011 06:35:26 -0700 Subject: [PATCH 3/5] ICL34 --- 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..667b641eb 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=ICL34 From 441dd497c4c52a3718cb2e57ac09d13a09ac330e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Nov 2011 12:35:16 -0700 Subject: [PATCH 4/5] ITL34 --- 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 6d0099e41..2c7fd2db0 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=ITL33D +export BUILD_ID=ITL34 From 03f71fcac864057060880b938fba5e1e02274b82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Nov 2011 21:03:44 -0700 Subject: [PATCH 5/5] ITL34B --- 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 2c7fd2db0..6e08d0348 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=ITL34 +export BUILD_ID=ITL34B