From 9e7de6792f6343f246e12a53f33a297aa67d6723 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 May 2011 16:14:27 -0700 Subject: [PATCH 1/8] GRJ55 Change-Id: Ie75ba136457e19223f1a0ca3be7dba1379e9f20f --- 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 4b7b0e42e..8fc62a69e 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 := GINGERBREAD -# 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=GRJ55 From 741b7c37075aff8585a46475583bc42c59477e91 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 May 2011 21:28:36 -0700 Subject: [PATCH 2/8] GRJ56 Change-Id: I82f3b91ab1b876bd942ef43959fe978949c95bbc --- 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 4b7b0e42e..5ab0a9ad7 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 := GINGERBREAD -# 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=GRJ56 From d36847bbcea471c1e0d5d68d34647cd57d1cffb9 Mon Sep 17 00:00:00 2001 From: android-merger Date: Thu, 26 May 2011 21:46:56 -0700 Subject: [PATCH 3/8] GRJ56B Change-Id: If91d5be2c6eb6a28e5e46688f10c34bd0fb47b93 --- 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 5ab0a9ad7..3b65f6df6 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=GRJ56 +export BUILD_ID=GRJ56B From a4652dbd8db27468c24ae478e2b189b6bccd1559 Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 27 May 2011 14:35:35 -0700 Subject: [PATCH 4/8] GRJ57 Change-Id: I88bed3c222969a0fa5f6bfa5510772ab47cb68a3 --- 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 3b65f6df6..714947d07 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=GRJ56B +export BUILD_ID=GRJ57 From 44d569d11aff06cf49db74bfeac708e33a25257e Mon Sep 17 00:00:00 2001 From: android-merger Date: Fri, 27 May 2011 14:54:02 -0700 Subject: [PATCH 5/8] GRJ57B Change-Id: I6a8c336ae35c80128b2c2c7218daa39b7cb226b0 --- 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 714947d07..90dea2551 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=GRJ57 +export BUILD_ID=GRJ57B From dfff9cd9bb5ce8e1959962294754bc1d777fec84 Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Tue, 31 May 2011 14:05:14 -0700 Subject: [PATCH 6/8] GT the gingerbread-mr2-release branch Change-Id: I22d6f9759fada4d7970dc915119345eb3fba24d4 --- 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 fed19c9ad..2c23e0b0b 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=GRJ22 +export BUILD_ID=GTJ61 From c05f729be7e700b8737e3047d2eaca71b94d3a81 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Jun 2011 15:00:39 -0700 Subject: [PATCH 7/8] GRJ67 Change-Id: I034d285ebaaa4e88f08c1f29cdbf41f837d9aeb3 --- 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 4b7b0e42e..5327f753e 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 := GINGERBREAD -# 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=GRJ67 From 853d146585b8f0c0820f21a9d6b607efa11e156e Mon Sep 17 00:00:00 2001 From: android-merger Date: Mon, 6 Jun 2011 15:18:47 -0700 Subject: [PATCH 8/8] GRJ67B Change-Id: I73742ebdf6e60ddf7fe40605e4f50b7188e082b9 --- 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 5327f753e..1be96ddfd 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=GRJ67 +export BUILD_ID=GRJ67B