From 7a004a2ac7cbdae9735813537d673ec6e4d1524f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 May 2012 13:29:18 -0700 Subject: [PATCH 1/8] JFN52 --- 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 297118d367..0a8e29143b 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=JRN51B +export BUILD_ID=JFN52 From e2875fa799303e1ccbac94fa80cdda34da112d14 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 May 2012 13:34:24 -0700 Subject: [PATCH 2/8] JFN51B --- 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 0a8e29143b..aee0db3651 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=JFN52 +export BUILD_ID=JFN51B From 3fbe1e2088efe9508d1940845aeb35ee7f028fab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 May 2012 07:10:16 -0700 Subject: [PATCH 3/8] JRN53 --- 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 40bb35dd39..bbc2979162 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 := MASTER -# 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=JRN53 From 1bdbe64ad6df7259e9eb8264bfd3ab5359f76d29 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 May 2012 17:37:06 -0700 Subject: [PATCH 4/8] JRN53B --- 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 bbc2979162..1cdde0ced9 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=JRN53 +export BUILD_ID=JRN53B From 8ad9c19d7228acefbabfa2e1e41d395506fa1a83 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 May 2012 21:37:08 -0700 Subject: [PATCH 5/8] JRN53C --- 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 1cdde0ced9..df4aa5edcf 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=JRN53B +export BUILD_ID=JRN53C From 7eb505123ccee741e44c2f1a068d259160bef1ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 23 May 2012 23:18:26 -0700 Subject: [PATCH 6/8] JRN53D --- 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 df4aa5edcf..7cd92137b5 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=JRN53C +export BUILD_ID=JRN53D From 8e3b307726b07462e968a764518d607efdba03f5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 May 2012 06:53:04 -0700 Subject: [PATCH 7/8] JRN53E --- 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 7cd92137b5..7506c0a93b 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=JRN53D +export BUILD_ID=JRN53E From ea1d824378deb3c53d533d239947da0d4ec0a3bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 24 May 2012 07:05:47 -0700 Subject: [PATCH 8/8] JRN54 --- 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 40bb35dd39..aec168924f 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 := MASTER -# 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=JRN54