From 0720d88673ce863ff9d8abf965385d1541784136 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Sep 2011 17:18:03 -0700 Subject: [PATCH 1/7] IFK77D --- 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 bacd7ec5b7..99c5c143ea 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=IFK77C +export BUILD_ID=IFK77D From 92375d7ca1a50525441e510681582276417b1b49 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 17 Sep 2011 08:17:40 -0700 Subject: [PATCH 2/7] IFK77E --- 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 99c5c143ea..afa7038484 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=IFK77D +export BUILD_ID=IFK77E From c075c1d6d609ae0748ca380a3f85e093d333d476 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 18 Sep 2011 06:30:47 -0700 Subject: [PATCH 3/7] IFK80 --- 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 e415e8db64..a1d7707757 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_FACTORYROM -# 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=IFK80 From a3a6bc3de319fc807921f038933eb63605e7b494 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 18 Sep 2011 15:26:05 -0700 Subject: [PATCH 4/7] IFK80B --- 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 a1d7707757..5aedf081ef 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=IFK80 +export BUILD_ID=IFK80B From 9699caaac7a53fbf6d032c13528dff2a920de19b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 18 Sep 2011 19:30:25 -0700 Subject: [PATCH 5/7] IFK80C --- 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 5aedf081ef..b8deae111f 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=IFK80B +export BUILD_ID=IFK80C From 7d22638c86672a99aa414ff1a841c9a751ca2544 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 18 Sep 2011 20:47:20 -0700 Subject: [PATCH 6/7] IFK80D --- 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 b8deae111f..6a781657e2 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=IFK80C +export BUILD_ID=IFK80D From ccbd70942dcc672def332bd3f9c94814e2a941d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 19 Sep 2011 06:29:30 -0700 Subject: [PATCH 7/7] IFK81 --- 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 e415e8db64..b4bab84d72 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_FACTORYROM -# 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=IFK81