From 77bd03d3e782821bd228a5675a84448f8d978147 Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Wed, 20 Apr 2011 09:01:50 -0700 Subject: [PATCH 001/349] IRJ20 Change-Id: I6bf3fd19e551d3540868df94e4042c3e87faf1e9 --- 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 40bb35dd..330f0f18 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,10 @@ # 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=IRJ20 + From 8fbf8b6404eb2396cfbca2d1f07d325cda359bb8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Apr 2011 13:32:13 -0700 Subject: [PATCH 002/349] IRJ20B Change-Id: I561813221c33a2253a9b0c3bb968c21a73a34899 --- 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 40bb35dd..23385338 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=IRJ20B From 17bff18521591cedb8799525eafa5c22b2ff309c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Apr 2011 07:03:01 -0700 Subject: [PATCH 003/349] IRJ21 Change-Id: I60ad90c3a1bbad69219ed35e31ab7398b40c5518 --- 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 40bb35dd..f7d094e7 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=IRJ21 From 400343032b09f22b39b4ff2650d6aec7b657478e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Apr 2011 07:52:37 -0700 Subject: [PATCH 004/349] IRJ21B Change-Id: I4d8740cfe5e9e75f741b0c63cc64e347e307fa6f --- 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 40bb35dd..c39bcf5b 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=IRJ21B From e518e46b64d2d720b52474815b056231ed970d6a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Apr 2011 07:03:34 -0700 Subject: [PATCH 005/349] IRJ22 Change-Id: I262a6c342f65efb520960ebfa69dab63e9e0bb68 --- 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 40bb35dd..495a7b07 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=IRJ22 From d234c48381a169a01f1452dc958dac8bcd320a7a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Apr 2011 07:03:40 -0700 Subject: [PATCH 006/349] IRJ25 Change-Id: I3b0e6816ef71cb47c82f3d2b8145279939d08309 --- 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 40bb35dd..c15ceefc 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=IRJ25 From 4fb5bc6bcd9de2fb5b40d47e7790f04c584f1f0d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Apr 2011 07:03:24 -0700 Subject: [PATCH 007/349] IRJ26 Change-Id: Ia40079c2c5917e2091ed141ee986b374508c5aba --- 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 40bb35dd..3f53ae08 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=IRJ26 From b1e368467893920282711b165a92d567d74239e3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Apr 2011 07:04:04 -0700 Subject: [PATCH 008/349] IRJ27 Change-Id: I9dc3cd728ce42be4380b677a429468efdf5f27d3 --- 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 40bb35dd..d898a852 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=IRJ27 From 35203b46bf91b6c58d2e47fa7f2ea4ee6a8aefc5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Apr 2011 07:27:32 -0700 Subject: [PATCH 009/349] IRJ27B Change-Id: Ic6e0fb48f69752c4fbdec66848c7e261feed0e0c --- 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 40bb35dd..ad059d2b 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=IRJ27B From 683e206b07a2d8bb20ac938d83fcb40748008dc4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Apr 2011 07:34:41 -0700 Subject: [PATCH 010/349] IRJ28 Change-Id: I48192b100dd5ec1875f1502594df62b30110b28a --- 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 40bb35dd..8bd33d14 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=IRJ28 From 7d7d37b541aad60d2c9f7f4f6011d1dffb0f1bd8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Apr 2011 07:04:06 -0700 Subject: [PATCH 011/349] IRJ29 Change-Id: Ic9299da5a1c5f9f9718e7eca9d1cf7c7d7f0add7 --- 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 40bb35dd..7a918540 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=IRJ29 From d79b75eb4a51b2bc2eaf779a235876821e93537e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 2 May 2011 07:04:19 -0700 Subject: [PATCH 012/349] IRJ32 Change-Id: I32367827a4d80a6caf69d333e7c8b8d5ec74de41 --- 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 40bb35dd..f5f7b571 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=IRJ32 From 911039104b95d4db0e4a711c9e982ea823be9cd8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 3 May 2011 07:04:22 -0700 Subject: [PATCH 013/349] IRJ33 Change-Id: I052f491ba124155487ea73ed702f4d8cfbd7a403 --- 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 40bb35dd..9b9f7e38 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=IRJ33 From b6cf85b811eeb0107da14a7ad422b1ab50db9767 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 May 2011 08:54:54 -0700 Subject: [PATCH 014/349] IRJ34 Change-Id: Ice7e9f3123873242314c9b47c156b3a915bd2fe1 --- 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 40bb35dd..885b6eaf 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=IRJ34 From 9cd846130b58324cfd58ec32ae345a2ad7e4676f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 5 May 2011 06:38:28 -0700 Subject: [PATCH 015/349] IRJ35 Change-Id: Ic03af001b95636a86442408a0d54c4f6d283cec9 --- 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 40bb35dd..800c64fe 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=IRJ35 From 4a8e6378aecac1196d315a0c3a482cf11e855c3f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 6 May 2011 06:38:47 -0700 Subject: [PATCH 016/349] IRJ36 Change-Id: I1525b9fc568e73dd542ba05079d29f6488aed4e5 --- 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 40bb35dd..0020dd39 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=IRJ36 From ac898c17bcb1c7c182fab683cc32429dc23ff4a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 9 May 2011 07:38:21 -0700 Subject: [PATCH 017/349] IRJ39 Change-Id: I82ae48e9fcb81cd405927fbb80e5dd2a0daf143c --- 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 40bb35dd..f204f760 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=IRJ39 From b4f5a64b6cc4105c2edf00e6799201da12da429d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 10 May 2011 07:41:28 -0700 Subject: [PATCH 018/349] IRJ40 Change-Id: Iaff3981140d17adc9e7bafa36d2551511035257a --- 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 40bb35dd..d6e8f1be 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=IRJ40 From f8aaa0a94dacabdbd67fa3044627fbb33a680fd5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 May 2011 06:39:00 -0700 Subject: [PATCH 019/349] IRJ41 Change-Id: Ia7ce9ff2ed7371b8ec548da0ef591202c533be68 --- 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 40bb35dd..c1959c08 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=IRJ41 From 635cbfafc9138e8d1ea3d9f0f455e41f90859558 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 May 2011 06:39:53 -0700 Subject: [PATCH 020/349] IRJ42 Change-Id: I3a53f449aea2c924000ed2b684c3e4e813a1e989 --- 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 40bb35dd..8a282595 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=IRJ42 From 14cf55d775f30675ff96b58e1d884aeeb7009658 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 May 2011 06:39:47 -0700 Subject: [PATCH 021/349] IRJ43 Change-Id: I3e090e4aacb1a0baab23d3cfc3f59a341220bac6 --- 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 40bb35dd..9dfe1382 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=IRJ43 From 8cbbd025434dbaa8781b100664d003460edc52e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 16 May 2011 06:40:48 -0700 Subject: [PATCH 022/349] IRJ46 Change-Id: Ibd0edd7c846a6d8584ab2325e709918c3386e8b6 --- 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 40bb35dd..b1cd08d7 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=IRJ46 From 40f865e0dd3e4a0155fb14aa71248d6eba5ae1d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 17 May 2011 06:40:50 -0700 Subject: [PATCH 023/349] IRJ47 Change-Id: I47a87d0ab1a60d10941d3ee4186194349dc75985 --- 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 40bb35dd..249c0451 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=IRJ47 From 85860b0b688da4343eebbd3bd287bab5fcf71c0d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 18 May 2011 06:40:31 -0700 Subject: [PATCH 024/349] IRJ48 Change-Id: I5a40cf28000661e5fd722a357c6142b11f2f101c --- 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 40bb35dd..7ce0754a 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=IRJ48 From 8f7358373085fca2e28c41bfd3871baf35acb600 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 19 May 2011 06:40:52 -0700 Subject: [PATCH 025/349] IRJ49 Change-Id: I6f215ceb179d9e92814d3159fed567593f4d51bd --- 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 40bb35dd..7afbb718 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=IRJ49 From 39b1a5a9baf1c193b669926c1ba425217d0344c8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 May 2011 06:41:24 -0700 Subject: [PATCH 026/349] IRJ50 Change-Id: Ib5c500fc57cbfed95205529ff4f6d5bbd692d9ba --- 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 40bb35dd..74d3af82 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=IRJ50 From 3a79e50f7733364a001659ca41e05a6d7f54ee0b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 May 2011 15:31:35 -0700 Subject: [PATCH 027/349] IRJ50B Change-Id: Iabf6e946499767752d025eb3794745b696ef0e75 --- 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 40bb35dd..4c0e65aa 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=IRJ50B From 94c38abc4c4ae80fcfe4f93f385d771c922e6d9f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 May 2011 06:40:43 -0700 Subject: [PATCH 028/349] IRJ53 Change-Id: I68348dffb7367a9330e26ca0d57f7e4f60417b56 --- 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 40bb35dd..2a2e449d 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=IRJ53 From 2eea519f6374a2f5f28113ead9cfbffce324d2bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 May 2011 14:19:47 -0700 Subject: [PATCH 029/349] IRJ53B Change-Id: Ifa3526f95a10ffe51e9b84118aae95c8f3a9ec3c --- 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 2a2e449d..2907c604 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=IRJ53 +export BUILD_ID=IRJ53B From 00bb49296a42e4847bd6cebe29c1163cb6176c3f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 May 2011 06:41:55 -0700 Subject: [PATCH 030/349] IRJ54 Change-Id: Iea0aa7a8b2bf269a4b23d00d24dc890cc9805e21 --- 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 40bb35dd..4c7a90bc 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=IRJ54 From 78af20fd6bc1b8df2029f526abf4f59ed00b65b0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 25 May 2011 06:42:13 -0700 Subject: [PATCH 031/349] IRJ55 Change-Id: I0b077ec800fb6a22f4bd5b0c8ad97b07ef7b6962 --- 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 40bb35dd..34c11b5b 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=IRJ55 From 93b4198ab62ee1d468e0bc1ec6fcce41dfb91c5c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 26 May 2011 07:45:16 -0700 Subject: [PATCH 032/349] IRJ56 Change-Id: I65702d7f822093eb6e5f9a8556301256bace42c4 --- 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 40bb35dd..8b793081 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=IRJ56 From 440087575e447a71a84414fda0c0429feedbeb71 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 May 2011 06:42:23 -0700 Subject: [PATCH 033/349] IRJ57 Change-Id: Iec94a5ecdc9491c85aadf96b27751419c7b6ed88 --- 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 40bb35dd..b10d098a 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=IRJ57 From 4d57847e1dd60b350053ec923a2727eaf353c445 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 27 May 2011 11:39:43 -0700 Subject: [PATCH 034/349] IRJ57B Change-Id: I6b6e332c11dacfcd713cc6219d2fcf467612a8cb --- 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 b10d098a..fce14e1a 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=IRJ57 +export BUILD_ID=IRJ57B From d4c3d5baf89aaa22fbf1bfbd11ef6cf1e028985c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 30 May 2011 06:43:41 -0700 Subject: [PATCH 035/349] IRJ60 Change-Id: I670171d98e3fad75d63900ec9ebf4565bdafba8f --- 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 40bb35dd..2e251585 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=IRJ60 From 8c8d753306db505ea529bc6da9d39d07060cb36c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 31 May 2011 06:40:54 -0700 Subject: [PATCH 036/349] IRJ61 Change-Id: I82f7607bdae235d7cd2eff52616f3cc9e7ec6a87 --- 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 40bb35dd..04aad173 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=IRJ61 From 96bd7a60b54c17875dbe2fea9e34baa41d12ca6d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 Jun 2011 06:42:40 -0700 Subject: [PATCH 037/349] IRJ62 Change-Id: Ice8255d6028d9b7a11abba53860fedf9084767c0 --- 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 40bb35dd..ee259a46 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=IRJ62 From 164adafada134254ad81f9a4832a3c3132267763 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 Jun 2011 06:44:58 -0700 Subject: [PATCH 038/349] IRJ63 Change-Id: I641a43786cfd3b65ff89ef70c4d0f6295aae5b80 --- 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 40bb35dd..67906056 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=IRJ63 From 86572f2438216e0ad558652e1de4bdbe7de8f4cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Jun 2011 06:43:34 -0700 Subject: [PATCH 039/349] IRJ64 Change-Id: Ic62b2845fdcd486ecd46dc12b691996287c79f9b --- 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 40bb35dd..1216f183 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=IRJ64 From 0d34f8e833d1eedeac0ef4697bc7fa70b864696d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 Jun 2011 14:56:53 -0700 Subject: [PATCH 040/349] IRJ64B Change-Id: I0a93110df5addec3b92969d680c726cb06be6fed --- 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 40bb35dd..ddbc6f46 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=IRJ64B From c59b85c1574462499d44adec70caddd6a3aa0a77 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 Jun 2011 06:43:31 -0700 Subject: [PATCH 041/349] IRJ67 Change-Id: If35dc727164cc1b220fcaacea763f9af28cb585a --- 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 40bb35dd..84593a4c 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=IRJ67 From b4b7b7193deb98bcefd4a2c0fbe346c9e4345ed6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Jun 2011 06:44:32 -0700 Subject: [PATCH 042/349] IRJ68 Change-Id: I7777b74f9f8960b451267b9a5c20a07da513cd0a --- 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 40bb35dd..547c3b10 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=IRJ68 From 41c77e09681d17b5243592474b5fa3eb09f798ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 Jun 2011 11:10:28 -0700 Subject: [PATCH 043/349] IRJ68B Change-Id: I28f7aeb9e9c29d82a6b40022bd1e14f0ef875faf --- 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 40bb35dd..4528c6de 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=IRJ68B From 0681cf09336dceb197e05f28ea1bcc79da5a62f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Jun 2011 06:44:10 -0700 Subject: [PATCH 044/349] IRJ69 Change-Id: I1eb3de353d1ecc4cc16e2bcd1ffafd641833c027 --- 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 40bb35dd..96af7404 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=IRJ69 From 4fbfd6d8e70b8aee0b9f6c43b7e2722a788daaff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 Jun 2011 15:47:26 -0700 Subject: [PATCH 045/349] IRJ69B Change-Id: I78c9d76670fa48b169c526c2120a98cb55bcca6a --- 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 96af7404..27b8d33b 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=IRJ69 +export BUILD_ID=IRJ69B From c758d5c762d3a1afe3278c53de12160caf7f83d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Jun 2011 06:44:36 -0700 Subject: [PATCH 046/349] IRJ70 Change-Id: I6c6a85cb4c6b7ecf1e5542f7ec2f79cbbedff0cd --- 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 40bb35dd..a3463a7a 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=IRJ70 From 6184ce82018b59e53680d8004844265a32d53e0d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 Jun 2011 13:25:30 -0700 Subject: [PATCH 047/349] IRJ70B Change-Id: I7f24ed2f457c70f23bc30ab9f929c005c6be3de6 --- 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 a3463a7a..a3f458f0 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=IRJ70 +export BUILD_ID=IRJ70B From d66ac2463d77c0a3a1cad8956dd5e837c79c9a4b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 Jun 2011 06:43:37 -0700 Subject: [PATCH 048/349] IRJ71 Change-Id: I1145913ad614402a2258fe110ff5894aabe23c00 --- 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 40bb35dd..e565b812 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=IRJ71 From 6cf46beba3105a784a74954eb29c2ce7ac23044f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Jun 2011 06:44:26 -0700 Subject: [PATCH 049/349] IRJ74 Change-Id: I0e29278f1d7a550a17e5724d4cfaf2eb430a71ca --- 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 40bb35dd..8ef1e8b2 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=IRJ74 From a0bf002ebb38aa61f450e536650575c3e9089301 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 Jun 2011 20:53:22 -0700 Subject: [PATCH 050/349] IRJ74B Change-Id: Ied3b614643df994d5657a25c0a6c23f65081b150 --- 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 8ef1e8b2..82036d4e 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=IRJ74 +export BUILD_ID=IRJ74B From ea64a3cb7f07c19305ac0d88efbf6cc4729ee32d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jun 2011 06:40:49 -0700 Subject: [PATCH 051/349] IRJ75 Change-Id: I823491e03822ea74da1800d84eaf11b18d23a901 --- 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 40bb35dd..1cd6dbef 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=IRJ75 From c20cd097b69c741e2b2ee19a16738b6cfbbc22b1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 Jun 2011 11:34:56 -0700 Subject: [PATCH 052/349] IRJ75B Change-Id: I1d4ce650453b36a0990b662074236d69631ec811 --- 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 1cd6dbef..1ae62b3c 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=IRJ75 +export BUILD_ID=IRJ75B From d293b365568d37c8750f938ea0ddcd00fd1a1f17 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Jun 2011 06:44:21 -0700 Subject: [PATCH 053/349] IRJ76 Change-Id: I6b3b0ac7ce534378cb172af370fd37f1f5103ce2 --- 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 40bb35dd..5b9d6c1d 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=IRJ76 From ae3c73f4033ebf8eb6b1ac7db1274e0871e0c80a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 Jun 2011 15:14:56 -0700 Subject: [PATCH 054/349] IRJ76B Change-Id: Ic0b4c22bd8bc65c17162cae816d807e7164e130f --- 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 5b9d6c1d..d11a8014 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=IRJ76 +export BUILD_ID=IRJ76B From 490af83cdf06bd5617beb286af21df4633e1ba0d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Jun 2011 08:46:13 -0700 Subject: [PATCH 055/349] IRJ77 Change-Id: I810f15c8ee53a1270807cf3ebd4d9777ea8d4c6c --- 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 40bb35dd..f9a511a1 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=IRJ77 From 4146bec6caf999d29eccf2a9bf8173fac1a5edb2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 Jun 2011 14:32:58 -0700 Subject: [PATCH 056/349] IRJ77B Change-Id: I9b0dd4a1c18adc4854922feed0eb6bd6ef5278db --- 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 f9a511a1..a1fcc62f 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=IRJ77 +export BUILD_ID=IRJ77B From ed364879b4409253bd3bd38a6dba1d512b92c54c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jun 2011 06:40:36 -0700 Subject: [PATCH 057/349] IRJ77C Change-Id: I2016d162a88f637d06f83411e915a987d9bc2e25 --- 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 a1fcc62f..e8d61cac 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=IRJ77B +export BUILD_ID=IRJ77C From 632f6e186ead3b432fb2c25d6f31c397282d9f31 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jun 2011 08:52:42 -0700 Subject: [PATCH 058/349] IRJ77D Change-Id: I36403d6221a844c575cb5e74b70e45f05501d307 --- 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 e8d61cac..6582a399 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=IRJ77C +export BUILD_ID=IRJ77D From d121ea52973ab5f048e29ae61277d7c808a406ff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jun 2011 14:27:59 -0700 Subject: [PATCH 059/349] IRJ78 Change-Id: I66df4b8aa35797c4a15fec0bb2307f28844cc6b7 --- 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 6582a399..1420695a 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=IRJ77D +export BUILD_ID=IRJ78 From 4a2fee390a2c828ea6a53dc865d80caa1fd8dbac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 Jun 2011 18:36:35 -0700 Subject: [PATCH 060/349] IRJ78B Change-Id: If4bf5d3470b2d324a71c310c429213501d70e7c3 --- 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 1420695a..532165c2 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=IRJ78 +export BUILD_ID=IRJ78B From 4522a74e4f96790ced5f2b23b8815bcb3fc509ae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Jun 2011 06:44:53 -0700 Subject: [PATCH 061/349] IRJ81 Change-Id: Ib71ea48c12bbfdb2755006cc906ee2e0440b2792 --- 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 40bb35dd..caca7e98 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=IRJ81 From 77285c55a68ffaaf7144660fd9a8dc6c128fc618 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 Jun 2011 13:29:48 -0700 Subject: [PATCH 062/349] IRJ81B Change-Id: Ia6e2f4c64f036df34bcc4f0b11258f8c05cde42b --- 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 caca7e98..f42f30e2 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=IRJ81 +export BUILD_ID=IRJ81B From 34f234013cda0bab6ccc7b3f20c0c1bc4e8ff1cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Jun 2011 06:45:39 -0700 Subject: [PATCH 063/349] IRJ82 Change-Id: I0ddca288adbcbcf561b7a6b05596f16b8e20ee82 --- 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 40bb35dd..251ae76b 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=IRJ82 From c2ab92b6f9005a2c6bd4486b1c67bbdff2956d73 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 Jun 2011 14:41:17 -0700 Subject: [PATCH 064/349] IRJ82B Change-Id: Ic9c2334ededc6c4f8a81d2d9721939772226f5cf --- 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 251ae76b..bc7cc4d3 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=IRJ82 +export BUILD_ID=IRJ82B From 5e0131d6ef1b7e9e0859fd79b76b324c918abc35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Jun 2011 06:48:53 -0700 Subject: [PATCH 065/349] IRJ83 Change-Id: I22594d1c9a8803af8df14736b9d18e5835d7b023 --- 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 40bb35dd..ab6afea8 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=IRJ83 From e80669fcc3d553feaa9d696b87dcd1c6f0bdd8ea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 Jun 2011 16:27:32 -0700 Subject: [PATCH 066/349] IRJ83B Change-Id: I312f1d472f2f81c4d2cab1757ea6af393cb731d2 --- 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 ab6afea8..db461e56 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=IRJ83 +export BUILD_ID=IRJ83B From 74b3ad1aeba8bc67758e11547a99d11165d2b54a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jun 2011 06:44:58 -0700 Subject: [PATCH 067/349] IRJ84 Change-Id: I2cb2fba949a04096da34cfc83f3452d07585e474 --- 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 40bb35dd..c656c2e3 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=IRJ84 From 86e1801c7f1b4d9d38907bddc2afa27c4c8a3faa Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 Jun 2011 15:34:04 -0700 Subject: [PATCH 068/349] IRJ84B Change-Id: I3372a8a2a19c3fd50648f00a5a0464631ae956e6 --- 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 c656c2e3..c914847d 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=IRJ84 +export BUILD_ID=IRJ84B From 97c313e9a52896beee6b37c5defb1cb610f43e36 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2011 13:05:56 -0700 Subject: [PATCH 069/349] Update to IRJ84C Change-Id: I1961d6a9d61eeb04337323283db0bf199aa2af8f --- 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 c914847d..8722cefc 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=IRJ84B +export BUILD_ID=IRJ84C From 04fe1de57b36bba8111fd481b0c59c54fbe17e5e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2011 13:30:46 -0700 Subject: [PATCH 070/349] IRJ85 Change-Id: I67774f7143ab8f6651fe373f83ec256285699534 --- 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 40bb35dd..1bf3e5c2 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=IRJ85 From ea1b47af13ea4106a2add78eb069a043f9280701 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2011 14:22:57 -0700 Subject: [PATCH 071/349] IRJ85B Change-Id: I11395c98577cdf7eb43b48c88166b1a84fedf2d3 --- 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 40bb35dd..4baaffb7 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=IRJ85B From 3864ce5a44c793b3125981c873d7184061d1a747 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 Jun 2011 15:56:12 -0700 Subject: [PATCH 072/349] IRJ85C Change-Id: I67871bd5888cad1f4893987710c81c69413d0993 --- 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 4baaffb7..2d3fa97f 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=IRJ85B +export BUILD_ID=IRJ85C From 9c93d5c3aaa34eaecb3377f2ce72892d6d96220a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Jun 2011 06:51:32 -0700 Subject: [PATCH 073/349] IRJ88 Change-Id: I3dcaa0420059e0aefcefb6e94a90d65714b91356 --- 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 40bb35dd..25e04081 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=IRJ88 From 92bb4d8a2a29d9c59108e0275698b57938195111 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 Jun 2011 14:25:17 -0700 Subject: [PATCH 074/349] IRJ88B Change-Id: Ifc0122c6a9434d78c69745c864ae068f7a32a375 --- 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 40bb35dd..7f488ae9 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=IRJ88B From fa97ee4399759ab8fd2455b6325aa2459c779ef0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Jun 2011 06:44:44 -0700 Subject: [PATCH 075/349] IRJ89 Change-Id: Ib10522e07dafa39a8ba14997815050ca9378b115 --- 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 40bb35dd..dbcfa568 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=IRJ89 From b736200c50ddacfd98dbf8a84ed7e1e14aef2f06 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 Jun 2011 13:51:32 -0700 Subject: [PATCH 076/349] IRJ89B Change-Id: Ie5c6c6a60763b4002d65c45bdd18fb3b0e195403 --- 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 dbcfa568..27c97dd2 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=IRJ89 +export BUILD_ID=IRJ89B From 7ec1d66e2daf1f12b11202e7e0f1db7d54919503 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Jun 2011 06:46:32 -0700 Subject: [PATCH 077/349] IRJ90 Change-Id: I3aae6e03976b642bb38356b72f14f56699d13ae9 --- 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 40bb35dd..bc6892f9 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=IRJ90 From 993a9c194b50767a4202266ef843ac64297bbac0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 Jun 2011 16:29:36 -0700 Subject: [PATCH 078/349] IRJ90B Change-Id: I9942b4d7a0d036c4e1db297d1e61ea145a80da1d --- 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 bc6892f9..3f94549e 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=IRJ90 +export BUILD_ID=IRJ90B From ac2d03b53ef0838757a54322f68f6aecee837d27 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jun 2011 06:44:35 -0700 Subject: [PATCH 079/349] IRJ91 Change-Id: I1b7a83362578dd17eaa50883a314f20fe8548749 --- 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 40bb35dd..6d53d6f8 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=IRJ91 From 516351df8475a856e549ab9ad1ff6b9de28423f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jun 2011 16:24:05 -0700 Subject: [PATCH 080/349] IRJ91B Change-Id: Iba64fa1e0013660cb72b0dc6b80537baadf7580d --- 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 6d53d6f8..ff4f7f15 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=IRJ91 +export BUILD_ID=IRJ91B From eacd2d4ba2512ad6e8381ac25b1415227502a151 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 Jun 2011 21:40:59 -0700 Subject: [PATCH 081/349] IRJ91C Change-Id: Ic509b00890d09f2e8984a04a6c3c562d0c9f2e8f --- 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 ff4f7f15..3e7ae89a 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=IRJ91B +export BUILD_ID=IRJ91C From 6a161bbfb1b50930f3300b0636cb86479eb7aa05 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Jul 2011 09:51:11 -0700 Subject: [PATCH 082/349] IRJ91D Change-Id: If04bf69185523a44c48187b4cae5de9d1d84960d --- 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 3e7ae89a..964ecf99 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=IRJ91C +export BUILD_ID=IRJ91D From 7a42ca8affc7cf9fab4149a31fec9c82e8241463 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 Jul 2011 06:48:21 -0700 Subject: [PATCH 083/349] IRK04 Change-Id: I5b1344966caf96375f99889108ab1431e4de5268 --- 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 40bb35dd..46793e6a 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=IRK04 From 620a250506fd2116fa368a27bb7390fa727e2924 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Jul 2011 06:44:06 -0700 Subject: [PATCH 084/349] IRK05 Change-Id: Ic2f9802df544ba7deea4d7453a79f54351c97fbc --- 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 40bb35dd..293fad7c 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=IRK05 From d017a7dcb9456476a51baf3889cc6088d5186320 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Jul 2011 06:41:59 -0700 Subject: [PATCH 085/349] IRK06 Change-Id: Ib9d88ebebfef518970dc28fa8db1d25c0b7e6245 --- 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 40bb35dd..ab9ce87f 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=IRK06 From 03d00039e56bb72569d43d47d4d03cd26ddcfdf4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Jul 2011 06:46:19 -0700 Subject: [PATCH 086/349] IRK07 Change-Id: Ic0a4e178f2101b97e28f966ad9af3997afa73cee --- 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 40bb35dd..8713b933 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=IRK07 From 0fc728551ec6e3a3c7304edb5f36ebbcc7badc41 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Jul 2011 12:29:15 -0700 Subject: [PATCH 087/349] IRK07B Change-Id: Icc4d668ba78e9daf3901a5999ace5ee0c124bca7 --- 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 40bb35dd..d4406d0f 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=IRK07B From 3645ebf2ae88fe585240fdec56056dd81fd12949 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Jul 2011 14:50:30 -0700 Subject: [PATCH 088/349] IRK07C Change-Id: I8be6929477556cb5bc07c6f2ae62ec230fd6172b --- 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 d4406d0f..2022693a 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=IRK07B +export BUILD_ID=IRK07C From 0094d9069ef0d4b8ba015029d869bf08d1ff8c30 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Jul 2011 19:24:05 -0700 Subject: [PATCH 089/349] IRK07D Change-Id: Ia0b2fe42c177d7ef9cd3566838b50bfa332cb5ff --- 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 2022693a..d35435bf 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=IRK07C +export BUILD_ID=IRK07D From 5a17df3ee36c609389bae6d532b1a7cb8d4b36f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Jul 2011 19:37:44 -0700 Subject: [PATCH 090/349] IRK07E Change-Id: I203c38bd88c3cbc82c523f49bfc500c1249f2c2d --- 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 d35435bf..f7bf92d5 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=IRK07D +export BUILD_ID=IRK07E From 9c7a22955a445ddf32fcd3b410a7c6a70be32281 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Jul 2011 22:55:08 -0700 Subject: [PATCH 091/349] IRK07F Change-Id: I2bbd1850c564e8201f069ee7a2348b7d6fb4362e --- 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 f7bf92d5..dc75e9e2 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=IRK07E +export BUILD_ID=IRK07F From f90dfb9b9d0654ab5ac529203367a3b50784677d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Jul 2011 10:20:05 -0700 Subject: [PATCH 092/349] IRK07F - take two Change-Id: Ifbda103ca1cca87e8eda5d49092e60a7d45c0eae --- core/build_id.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/build_id.mk b/core/build_id.mk index dc75e9e2..0da4092e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -20,3 +20,4 @@ # capitalized by convention. export BUILD_ID=IRK07F + From 6cb78c82607fc0da645c1f96f02f31b0bd32e329 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Jul 2011 14:11:31 -0700 Subject: [PATCH 093/349] IRK08 Change-Id: I69202d4eaf866599db3a8922d3111a0e53bd75e2 --- 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 40bb35dd..27e59988 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=IRK08 From 99f77614aa7eb60de3660b9f5f790536fdd2eea6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 Jul 2011 06:47:02 -0700 Subject: [PATCH 094/349] IRK10 Change-Id: I86c078cf38ec165881733f4fabdb5a1fdc263361 --- 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 40bb35dd..dce551c0 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=IRK10 From c6667c386c01dc8ce93e40445267bbf6d4eb275a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 10 Jul 2011 14:57:41 -0700 Subject: [PATCH 095/349] IRK10B Change-Id: I1bb00e12faeb029e8260b97f5f108110f035862e --- 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 dce551c0..5662f566 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=IRK10 +export BUILD_ID=IRK10B From 1f4e9a51b4dd05db22720c5a2d83a5d4f6b2b976 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Jul 2011 06:45:16 -0700 Subject: [PATCH 096/349] IRK11 Change-Id: Ib4f722c41d63641f0b2d6caf883ed17e8e6c7e40 --- 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 40bb35dd..288664be 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=IRK11 From e7f8440862ca62189875872d4e8ebf88cbf61cd8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Jul 2011 06:20:37 -0700 Subject: [PATCH 097/349] IRK11B Change-Id: I77c9ba727248130f8efd56fec3c64e17cb19b3d0 --- 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 288664be..19dea083 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=IRK11 +export BUILD_ID=IRK11B From 4d1e37b05aca56ccd0b967c906a79f2223aeba27 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Jul 2011 06:41:20 -0700 Subject: [PATCH 098/349] IRK12 Change-Id: Ie4f49e347d4ebd78a727f074e57606dd0a0c5241 --- 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 40bb35dd..8621d886 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=IRK12 From 6ff338ef784373e34815e360b917a7ccaee9d18e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Jul 2011 17:02:30 -0700 Subject: [PATCH 099/349] IRK12B Change-Id: If7f284f9c8300c2e93b436f1680445d448088869 --- 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 8621d886..51ef6a33 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=IRK12 +export BUILD_ID=IRK12B From be6c3dec843e570fa818f208ad1fc5f584547ba8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Jul 2011 07:47:28 -0700 Subject: [PATCH 100/349] IRK13 Change-Id: Ib4fb5d4f1ed637f3fe5b4082c9ec153cf2736931 --- 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 40bb35dd..e5e04217 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=IRK13 From 7aa2c1fb1542e8ceca751b3c2ae612f7200d3948 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Jul 2011 07:08:04 -0700 Subject: [PATCH 101/349] IRK14 Change-Id: I5e1e795e4a7fe99f0827fa737737f3a2f87c0f60 --- 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 40bb35dd..e5b45771 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=IRK14 From 38dbb8fb5b27cb3e3c470b815900a1b3a5d418fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Jul 2011 14:58:50 -0700 Subject: [PATCH 102/349] IRK14B Change-Id: I403fbd1bf14ab51d24e3fd257f9ae85f753a539b --- 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 e5b45771..7770a0f4 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=IRK14 +export BUILD_ID=IRK14B From e58aa8d0106398024bdec20003af846eb09345d6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Jul 2011 22:17:57 -0700 Subject: [PATCH 103/349] IRK14C Change-Id: I0c0bbd414a366ffe4d816ebf2dc0a0b36a9f3062 --- 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 7770a0f4..e8281269 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=IRK14B +export BUILD_ID=IRK14C From c4492f65d14fe467b59fd94019e786fed333a0d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Jul 2011 06:45:44 -0700 Subject: [PATCH 104/349] IRK15 Change-Id: Id1f9c4859a7075898cfb672c5dfe026651e59264 --- 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 40bb35dd..faaa5593 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=IRK15 From b872d918ec9234c716c05eec85163f755111f8d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 16 Jul 2011 15:54:30 -0700 Subject: [PATCH 105/349] IRK15x - a one off test build Change-Id: Id6dc3a77806419289cdf3c2cc9cbca0838066f05 --- 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 faaa5593..cf2f4194 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=IRK15 +export BUILD_ID=IRK15x From d51fc6a9a32132f7496e95708721eca791405940 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 17 Jul 2011 12:19:39 -0700 Subject: [PATCH 106/349] IRK17 Change-Id: Ie8c57ffde4959a2cd768cdd170d194d56ec7194f --- 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 40bb35dd..c661ed96 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=IRK17 From d328ad8cf10977b5071b69484e4d452ff2f2b1a5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Jul 2011 06:43:23 -0700 Subject: [PATCH 107/349] IRK18 Change-Id: Icfd9cad1dd64faab352fd8a19a7ffaee97c9037e --- 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 40bb35dd..81b08ae0 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=IRK18 From fb48992b921be2f34e7b026ed3942981237e9fbe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Jul 2011 06:47:25 -0700 Subject: [PATCH 108/349] IRK19 Change-Id: I9d2d4b8493ffc7026a4b9e5c81b882b097caa215 --- 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 40bb35dd..1849775d 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=IRK19 From 820a7ff29704d3947f4d92655ee3177b351dbafd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Jul 2011 06:47:30 -0700 Subject: [PATCH 109/349] IRK20 Change-Id: Iecc999e99dd5c5d327dbb06a91f618f5efdd76d0 --- 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 40bb35dd..e79a80be 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=IRK20 From ebe701610d4f60fad22403f3230cc1149b15731b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Jul 2011 10:09:27 -0700 Subject: [PATCH 110/349] IRK20B Change-Id: I3acd7de4f2d96f4b8d43427b1d67850a35694c97 --- 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 40bb35dd..e235833f 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=IRK20B From 0157d6c1ec32f3c0902f47e53c5158b6ecb69b7d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Jul 2011 06:48:08 -0700 Subject: [PATCH 111/349] IRK21 Change-Id: I71143d95160603b60b9db2fa2ca736b3818d12a3 --- 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 40bb35dd..6a6ebf92 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=IRK21 From 2fa0e7aa45faea1dff6b5d5614c672a9a976040b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Jul 2011 16:55:42 -0700 Subject: [PATCH 112/349] IRK21B Change-Id: Id0f5bc955d6adbb960be5119b196a5a0ca68e0f1 --- 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 6a6ebf92..67989164 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=IRK21 +export BUILD_ID=IRK21B From ccb2ed26ea3792fd24a74bead49e5a5e1b121f90 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Jul 2011 13:53:56 -0700 Subject: [PATCH 113/349] IRK22 Change-Id: I06e44a2c65e9eff2a0739c52716a25f14bf0b5da --- 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 40bb35dd..f299e2da 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=IRK22 From 3eb38972cc9814f0a814a33f17e30f4229cf7b53 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Jul 2011 17:05:31 -0700 Subject: [PATCH 114/349] IRK22B Change-Id: I252cb4e67ec2f44f7efccce6ae771f24033d4ba1 --- 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 f299e2da..b62f6bbe 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=IRK22 +export BUILD_ID=IRK22B From 82de7999e4a2c3475833b931d7a927ad4d32a9c1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Jul 2011 06:48:17 -0700 Subject: [PATCH 115/349] IRK25 Change-Id: If0f6ffc7a6415d99fd7c866136f9455f00489ec4 --- 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 40bb35dd..cd7d4b44 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=IRK25 From c8f21224aed80c822be400e5d54138c915561ee9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Jul 2011 06:38:06 -0700 Subject: [PATCH 116/349] IRK26 Change-Id: I194ec1939a7bcbc0ba71a8030f14b95dcdad6c0b --- 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 40bb35dd..fd71d7aa 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=IRK26 From 43e495669bf994f619d4494c173545707b5d8545 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Jul 2011 06:48:59 -0700 Subject: [PATCH 117/349] IRK27 Change-Id: I3883b206586399d35df01a2a5d1633d59f90e0a1 --- 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 40bb35dd..09c71f2c 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=IRK27 From 9e874960850c21c2b958d1000a82fe8ad97f97f1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Jul 2011 14:38:12 -0700 Subject: [PATCH 118/349] IRK27B Change-Id: I6844408db9f394b92578e7799612802dcc6e6fda --- 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 09c71f2c..25bbfb9a 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=IRK27 +export BUILD_ID=IRK27B From c3c12fc23b5ed36bbc78e816e8ccf44096617205 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Jul 2011 06:39:15 -0700 Subject: [PATCH 119/349] IRK28 Change-Id: Ib09eacd68a5a3bd870641307d3889d736c7d1e96 --- 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 40bb35dd..eed94c17 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=IRK28 From 53183dd97c05892a181bca8662fe713bee54b997 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Jul 2011 12:58:46 -0700 Subject: [PATCH 120/349] IRK28B Change-Id: I2d6b94455b36a1cc5fa1dc45e4beb46fdfc1853d --- 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 eed94c17..2bb6749c 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=IRK28 +export BUILD_ID=IRK28B From c8011381f358a317aae167f3025726325ae4dd04 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Jul 2011 11:45:23 -0700 Subject: [PATCH 121/349] IRK28C Change-Id: If292e54a1ffe4cfbadab6a26f995353871e78134 --- 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 2bb6749c..5278c07e 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=IRK28B +export BUILD_ID=IRK28C From 935d9140472a2b059b8e3db6820ad4aeb74f6705 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Aug 2011 07:00:38 -0700 Subject: [PATCH 122/349] IRK32 --- 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 40bb35dd..b5408bdf 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=IRK32 From 32f3f7b246791a87a3e9dc3cae90dc70d530b487 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Aug 2011 12:54:43 -0700 Subject: [PATCH 123/349] IRK32B --- 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 b5408bdf..9b85bb99 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=IRK32 +export BUILD_ID=IRK32B From 65d3aab9bc98ed5c2fcdfc5421f1bfe756ee4567 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Aug 2011 06:30:16 -0700 Subject: [PATCH 124/349] IRK33 --- 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 9b85bb99..71301116 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=IRK32B +export BUILD_ID=IRK33 From 868e5d96f9150bea6320f4478e4373b7217d3213 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Aug 2011 06:53:32 -0700 Subject: [PATCH 125/349] IRK33B --- 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 40bb35dd..f0816d11 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=IRK33B From 8d66e0d97fb961fec74862b3c2b5d17526fe441c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Aug 2011 13:52:25 -0700 Subject: [PATCH 126/349] IRK33C --- 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 f0816d11..56a44d50 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=IRK33B +export BUILD_ID=IRK33C From 237aa08860f8939c6b2fc8740ec2d0da58a2c8d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Aug 2011 06:37:29 -0700 Subject: [PATCH 127/349] IRK34 --- 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 40bb35dd..750d82fb 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=IRK34 From 1e2681b6a30d967972814306dcc7a7135f686ec8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Aug 2011 13:46:42 -0700 Subject: [PATCH 128/349] IRK34B --- 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 750d82fb..d56e754e 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=IRK34 +export BUILD_ID=IRK34B From 3740cdcc4a08aff737cb030fc96fd69059a98c7b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Aug 2011 06:52:20 -0700 Subject: [PATCH 129/349] IRK35 --- 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 40bb35dd..33100cb5 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=IRK35 From 3adc9ffa6416d833a5c44c16dede0ee3864f74ae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Aug 2011 13:15:23 -0700 Subject: [PATCH 130/349] IRK35B --- 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 33100cb5..6b9bd9fb 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=IRK35 +export BUILD_ID=IRK35B From e280adb56396025c7390db1fa9a4b3a015f6578c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Aug 2011 17:28:47 -0700 Subject: [PATCH 131/349] IRK35C --- 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 6b9bd9fb..ca6a3da4 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=IRK35B +export BUILD_ID=IRK35C From 766d4c93fae69dd487ea6083b829df1a6f191cbf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Aug 2011 11:19:10 -0700 Subject: [PATCH 132/349] IRK36 --- 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 40bb35dd..4caa0260 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=IRK36 From 209e0f179be6b7985bb0fd61a183418ffe4975c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Aug 2011 16:21:39 -0700 Subject: [PATCH 133/349] IRK36B --- 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 4caa0260..bade1594 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=IRK36 +export BUILD_ID=IRK36B From b88bf40606e1aa6dd94529ad7ef2e2fa0629b190 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Aug 2011 08:27:20 -0700 Subject: [PATCH 134/349] IRK39 --- 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 40bb35dd..3c99c7e2 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=IRK39 From 24978bf9058267cc678c5452a0eeffda6e0300ea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Aug 2011 06:36:13 -0700 Subject: [PATCH 135/349] IRK40 --- 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 40bb35dd..471e3f75 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=IRK40 From 41000007e1cdeb21f9e4f828bc162a16ec5cadcd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Aug 2011 15:16:33 -0700 Subject: [PATCH 136/349] IRK40B --- 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 471e3f75..033acc5b 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=IRK40 +export BUILD_ID=IRK40B From dbc2a7d844c9c54e42036f4528f5f80047d21e55 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Aug 2011 16:37:05 -0700 Subject: [PATCH 137/349] IRK40C --- 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 033acc5b..00b55083 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=IRK40B +export BUILD_ID=IRK40C From 30dd9f4b6404c3f386ee533a462999f0a28c27a9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Aug 2011 06:35:22 -0700 Subject: [PATCH 138/349] IRK41 --- 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 40bb35dd..1c282aff 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=IRK41 From f7f4c368ebdef22c6ac0ef75bc93338974f5b356 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Aug 2011 06:35:19 -0700 Subject: [PATCH 139/349] IRK42 --- 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 40bb35dd..8072f7bd 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=IRK42 From e180e9ed52ab49dd8497f17e146d9632e99f31c1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Aug 2011 10:27:27 -0700 Subject: [PATCH 140/349] IRK42B --- 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 40bb35dd..568d67ed 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=IRK42B From 6ae91177355cf1385411de98aa9e8ffaa28038c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Aug 2011 15:16:20 -0700 Subject: [PATCH 141/349] IRK42C --- 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 568d67ed..52976a97 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=IRK42B +export BUILD_ID=IRK42C From 04f066e03ad56aa32f4bc847d72cdfef4ee0507f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Aug 2011 11:58:57 -0700 Subject: [PATCH 142/349] IRK42D --- 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 52976a97..a8d077ef 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=IRK42C +export BUILD_ID=IRK42D From aabb97e0a41263e0b17f95ba405c4a3d3fcdd742 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Aug 2011 14:01:11 -0700 Subject: [PATCH 143/349] IRK42E --- 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 a8d077ef..ab0b5102 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=IRK42D +export BUILD_ID=IRK42E From 1615bf9f420f686cbaaf8ec71597a6d8fd2db61e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Aug 2011 15:02:40 -0700 Subject: [PATCH 144/349] IRK42F --- 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 ab0b5102..04c4b198 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=IRK42E +export BUILD_ID=IRK42F From 14949e5643033c7a39d2b3522323050315d28916 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Aug 2011 06:36:02 -0700 Subject: [PATCH 145/349] IRK46 --- 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 40bb35dd..edab82db 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=IRK46 From 1840e8b871d6d52cdbfaad35be92f74c8bd67e61 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Aug 2011 14:58:58 -0700 Subject: [PATCH 146/349] IRK46B --- 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 edab82db..95ece359 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=IRK46 +export BUILD_ID=IRK46B From de21e2840615f938199b520eb6bb74d29788dbe6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Aug 2011 06:36:14 -0700 Subject: [PATCH 147/349] IRK47 --- 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 40bb35dd..76dc336f 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=IRK47 From c0298ae04734b1df193c0f0b8eb402c9ff113195 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Aug 2011 07:57:36 -0700 Subject: [PATCH 148/349] IRK47 again --- core/build_id.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/core/build_id.mk b/core/build_id.mk index 76dc336f..7f77eceb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -20,3 +20,4 @@ # capitalized by convention. export BUILD_ID=IRK47 + From 82eeaf1da9045e7407546f8786692854c12dcc38 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Aug 2011 17:12:52 -0700 Subject: [PATCH 149/349] IRK47B --- 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 7f77eceb..0b06f986 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -19,5 +19,5 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=IRK47 +export BUILD_ID=IRK47B From ee796b3cabc61ea7b6fe9b53921fe67c5163f378 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Aug 2011 06:33:48 -0700 Subject: [PATCH 150/349] IRK48 --- 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 40bb35dd..4b545be9 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=IRK48 From eb00173fb0766ba5bb89f9d4839f9fc9307d164d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Aug 2011 13:43:37 -0700 Subject: [PATCH 151/349] IRK48B --- 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 4b545be9..cf711861 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=IRK48 +export BUILD_ID=IRK48B From bf871e0c20cc6c6d08fb45675beb4917a96dec91 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Aug 2011 06:36:02 -0700 Subject: [PATCH 152/349] IRK49 --- 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 40bb35dd..d6f3988c 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=IRK49 From a73014bd2d06c542c293e2e06a6be9e38b8fce74 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Aug 2011 11:56:11 -0700 Subject: [PATCH 153/349] IRK49B --- 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 d6f3988c..b8055ebf 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=IRK49 +export BUILD_ID=IRK49B From 0cf58332c92d2841298e30ea9cb2ccd7fd1d918d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Aug 2011 14:42:29 -0700 Subject: [PATCH 154/349] IRK49C --- 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 b8055ebf..ba5d370b 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=IRK49B +export BUILD_ID=IRK49C From a479385297387774453641365f20819529fe9e03 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Aug 2011 18:54:35 -0700 Subject: [PATCH 155/349] IRK49D --- 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 ba5d370b..ef900184 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=IRK49C +export BUILD_ID=IRK49D From 4fdadcfabc77367cdd8992206f9b83e8449aff3d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Aug 2011 13:58:38 -0700 Subject: [PATCH 156/349] IRK49E --- 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 ef900184..15c1447f 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=IRK49D +export BUILD_ID=IRK49E From e53e67dc6ea37a715b73729678269ecc7d5b2a7f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Aug 2011 06:33:35 -0700 Subject: [PATCH 157/349] IRK53 --- 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 40bb35dd..d444083b 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=IRK53 From 05d96e01278f373f18b6639539a082401a48d8c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Aug 2011 17:27:04 -0700 Subject: [PATCH 158/349] IRK53B --- 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 d444083b..0623a72e 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=IRK53 +export BUILD_ID=IRK53B From 227d018e25dc9654afa32af6997ebd7686126c4a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Aug 2011 06:36:14 -0700 Subject: [PATCH 159/349] IRK54 --- 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 40bb35dd..08916b92 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=IRK54 From 888f9e06fb057ef22a419677edb323771d4fccab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Aug 2011 14:00:37 -0700 Subject: [PATCH 160/349] IRK54B --- 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 08916b92..1e7a5664 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=IRK54 +export BUILD_ID=IRK54B From 5b91a1a8458c494af7020d19b2ba6cd088eb9ab6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Aug 2011 06:35:18 -0700 Subject: [PATCH 161/349] IRK55 --- 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 40bb35dd..16528b61 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=IRK55 From 4f474d79eaafdaedec344b107f009ee45f70a803 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Aug 2011 15:37:32 -0700 Subject: [PATCH 162/349] IRK55B --- 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 16528b61..cd205d05 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=IRK55 +export BUILD_ID=IRK55B From f5d25bc84d167b078629e35268aeddbb1ced4af6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Aug 2011 06:35:56 -0700 Subject: [PATCH 163/349] IRK56 --- 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 40bb35dd..f05749c4 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=IRK56 From f8b314b827686e0a15f75e6c8f83cb57b8bb90c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Aug 2011 13:54:40 -0700 Subject: [PATCH 164/349] IRK56B --- 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 f05749c4..30010e1b 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=IRK56 +export BUILD_ID=IRK56B From 0e1f2b25347338653024588c99e6da5c96e3fb0b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Aug 2011 16:30:33 -0700 Subject: [PATCH 165/349] IRK56C --- 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 30010e1b..28e2cc5e 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=IRK56B +export BUILD_ID=IRK56C From 3c1e50a6d99703e568a7a737042d4ee0a00611df Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Aug 2011 11:21:06 -0700 Subject: [PATCH 166/349] IRK56D --- 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 28e2cc5e..66f6b10e 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=IRK56C +export BUILD_ID=IRK56D From d36e72bdccdecc9181375ee8db793c227d6142df Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Aug 2011 13:55:21 -0700 Subject: [PATCH 167/349] IRK56E --- 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 66f6b10e..0e219772 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=IRK56D +export BUILD_ID=IRK56E From 339718b5e7d9294c77022997ba5e2485c62fd11c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Aug 2011 14:41:40 -0700 Subject: [PATCH 168/349] IRK56F --- 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 0e219772..58d906bf 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=IRK56E +export BUILD_ID=IRK56F From e0fcbe45352593a3486a487285e838bb28c6df66 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Aug 2011 06:36:03 -0700 Subject: [PATCH 169/349] IRK60 --- 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 40bb35dd..24e861b1 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=IRK60 From 4f694be67b4bfb18b67b2d013e3f2c5f85c02f63 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Aug 2011 16:00:19 -0700 Subject: [PATCH 170/349] IRK60B --- 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 24e861b1..683a8aa0 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=IRK60 +export BUILD_ID=IRK60B From e75abb225f5eecc62bae89b79311f061e2c6b81c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Aug 2011 16:05:47 -0700 Subject: [PATCH 171/349] IRK60C --- 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 683a8aa0..e478f160 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=IRK60B +export BUILD_ID=IRK60C From e5f1b84a0ba3224f682139602725f7454ee76436 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Aug 2011 16:12:00 -0700 Subject: [PATCH 172/349] IRK60D --- 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 e478f160..fb7a2b27 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=IRK60C +export BUILD_ID=IRK60D From 8ce7c0f8bab4c6da9638fe799e537e1d5f58c16a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 06:35:38 -0700 Subject: [PATCH 173/349] IRK61 --- 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 40bb35dd..05de8d01 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=IRK61 From 81d40deda7422274f21b3d0a0af2c485d56d60b1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 12:46:36 -0700 Subject: [PATCH 174/349] IRK60E --- 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 fb7a2b27..eef2dba3 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=IRK60D +export BUILD_ID=IRK60E From 94d60e7006d7bfab37865d94141bee5502216623 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 13:11:13 -0700 Subject: [PATCH 175/349] IRK60F --- 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 fb7a2b27..2de9d804 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=IRK60D +export BUILD_ID=IRK60F From 1c78a9af1a83e2e0355c8fccfc2eb1e782a4bc43 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 13:43:20 -0700 Subject: [PATCH 176/349] IRK61 --- 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 40bb35dd..05de8d01 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=IRK61 From 80d3e62489197dfbbe47a17474f3f44caeddc3e7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 13:45:03 -0700 Subject: [PATCH 177/349] IRK61B --- 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 05de8d01..5fca4afd 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=IRK61 +export BUILD_ID=IRK61B From 8b33a97480d5afd8ac600da64fcdb35c1da16abe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 23:28:17 -0700 Subject: [PATCH 178/349] IRK61C --- 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 5fca4afd..2843f4e0 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=IRK61B +export BUILD_ID=IRK61C From 3c6a9d95b482978697e1a5c32b0f41cb43fa9dab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 31 Aug 2011 06:35:38 -0700 Subject: [PATCH 179/349] IRK62 --- 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 40bb35dd..30007eb6 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=IRK62 From 4f8590df68738c4c094c24d44323cf85c9b0869c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 31 Aug 2011 13:49:24 -0700 Subject: [PATCH 180/349] IRK62B --- 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 30007eb6..823cbf63 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=IRK62 +export BUILD_ID=IRK62B From 8e8f4f546d44ec0ebab000190c472b61f98a3143 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 31 Aug 2011 18:20:57 -0700 Subject: [PATCH 181/349] IRK62C --- 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 823cbf63..2b331095 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=IRK62B +export BUILD_ID=IRK62C From b804141017f34734e1e6e17bcd9277ffda9cc7c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 Sep 2011 06:35:22 -0700 Subject: [PATCH 182/349] IRK63 --- 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 40bb35dd..850aa117 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=IRK63 From f1253042f219ab653e3b5808cd5dbe5a9c8087fe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 Sep 2011 16:19:02 -0700 Subject: [PATCH 183/349] IRK63B --- 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 850aa117..97308750 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=IRK63 +export BUILD_ID=IRK63B From bf6e98105d765a22b38f2ccbf060b5b2dab7b062 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 Sep 2011 18:09:36 -0700 Subject: [PATCH 184/349] IRK63C --- 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 97308750..433cbf62 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=IRK63B +export BUILD_ID=IRK63C From f0fd97e8d7597f9b0ad1b6b8d5c583cdfe7d6bed Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Sep 2011 10:26:57 -0700 Subject: [PATCH 185/349] IRK63D --- 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 433cbf62..28b7535f 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=IRK63C +export BUILD_ID=IRK63D From 5f672f36b6c55a4673394aed4a198cad53c13d72 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Sep 2011 16:04:31 -0700 Subject: [PATCH 186/349] IRK64 --- 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 40bb35dd..84ec1ab5 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=IRK64 From 54a32b05c549b99fdc73980fb2ae884538fa8f0d Mon Sep 17 00:00:00 2001 From: Justin Ho Date: Fri, 2 Sep 2011 08:00:53 -0700 Subject: [PATCH 187/349] Remove pinyinIME Change-Id: If83419336294eb56d5b96384a7bc9d9821888b02 --- core/user_tags.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/user_tags.mk b/core/user_tags.mk index c1c8ccf8..d09a2cdf 100644 --- a/core/user_tags.mk +++ b/core/user_tags.mk @@ -69,7 +69,6 @@ GRANDFATHERED_USER_MODULES += \ check_stack \ check_trace \ cmu2nuance \ - com.android.inputmethod.pinyin.lib \ com.android.phone.common \ com.android.vcard \ commons-compress-1.0 \ @@ -254,7 +253,6 @@ GRANDFATHERED_USER_MODULES += \ libiptc \ libjnigraphics \ libjni_latinime \ - libjni_pinyinime \ libjpeg \ libjs \ liblinenoise \ From 1dc44b2906c1e9ae5c671aab8410e4351e726913 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Sep 2011 16:32:30 -0700 Subject: [PATCH 188/349] IRK64B --- 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 84ec1ab5..10ecca80 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=IRK64 +export BUILD_ID=IRK64B From 5b609af6ab9b604853098f761a998388d0509d95 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 5 Sep 2011 06:36:41 -0700 Subject: [PATCH 189/349] IRK67 --- 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 40bb35dd..72693236 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=IRK67 From eadde5de794ca9f58f2ac1b0a72190515fc05bbc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Sep 2011 06:35:22 -0700 Subject: [PATCH 190/349] IRK68 --- 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 40bb35dd..5a93eef8 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=IRK68 From 6035826153223c35ed815a441ca100c74255b067 Mon Sep 17 00:00:00 2001 From: Justin Ho Date: Tue, 6 Sep 2011 13:04:36 -0700 Subject: [PATCH 191/349] Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006 Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc --- core/dex_preopt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 67709f42..b801ac29 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -4,7 +4,7 @@ #################################### # TODO: replace it with device's BOOTCLASSPATH -DEXPREOPT_BOOT_JARS := core:apache-xml:bouncycastle:ext:framework:android.policy:services:core-junit:filterfw +DEXPREOPT_BOOT_JARS := core:core-junit:bouncycastle:ext:framework:android.policy:services:apache-xml:filterfw DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) DEXPREOPT_BUILD_DIR := $(OUT_DIR) From db4ceac43a557dc19703a8f84b83b9344012757f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Sep 2011 17:23:23 -0700 Subject: [PATCH 192/349] IRK68B --- 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 5a93eef8..56552ff9 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=IRK68 +export BUILD_ID=IRK68B From 4cfba5202c9c29f3ce62af314cd40b8496973dda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Sep 2011 19:12:30 -0700 Subject: [PATCH 193/349] IRK68C --- 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 56552ff9..cb43fba4 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=IRK68B +export BUILD_ID=IRK68C From ec77193406dd135a696448cabb65c07327df8648 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Sep 2011 20:22:55 -0700 Subject: [PATCH 194/349] IRK68D --- 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 cb43fba4..d9d6d0f2 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=IRK68C +export BUILD_ID=IRK68D From b8c893edff788bee573be53cb9b9029a119a67ec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Sep 2011 06:36:17 -0700 Subject: [PATCH 195/349] IRK69 --- 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 40bb35dd..cb0c29a7 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=IRK69 From 0de0fb6432b2040143c00586e4aee99eae6f6d87 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Sep 2011 10:59:37 -0700 Subject: [PATCH 196/349] IRK69B --- 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 cb0c29a7..d9393d50 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=IRK69 +export BUILD_ID=IRK69B From 1a539eacd0f33eef4764434e28ac69f929bde9c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Sep 2011 17:49:25 -0700 Subject: [PATCH 197/349] IRK69C --- 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 d9393d50..83dc7c4f 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=IRK69B +export BUILD_ID=IRK69C From 0ac0c26fce2c396ce938e110c24aa9cd210b42c8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Sep 2011 06:36:12 -0700 Subject: [PATCH 198/349] IRK70 --- 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 40bb35dd..afdc9522 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=IRK70 From 931c16e4097527eabcd16828a9227a024f5db0ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Sep 2011 14:24:37 -0700 Subject: [PATCH 199/349] IRK70B --- 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 afdc9522..de878afb 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=IRK70 +export BUILD_ID=IRK70B From 919542b84c40ce63005522387c19bfa68669da40 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 9 Sep 2011 13:34:44 -0700 Subject: [PATCH 200/349] IRK70C --- 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 de878afb..a20204b6 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=IRK70B +export BUILD_ID=IRK70C From 37d9678e18fb823a9b3df3db66f5efedb85cd4ad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 11 Sep 2011 06:44:19 -0700 Subject: [PATCH 201/349] IRK73 --- 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 40bb35dd..7853b426 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=IRK73 From 388f73aaeaf0c9c2fe7c9eac77afaeeda0d4de14 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 11 Sep 2011 14:05:57 -0700 Subject: [PATCH 202/349] IRK73B --- 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 7853b426..2110d8c2 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=IRK73 +export BUILD_ID=IRK73B From a87a32b2b0e5363c7485b97c1bbdbb68328380ad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 12 Sep 2011 06:35:12 -0700 Subject: [PATCH 203/349] IRK74 --- 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 40bb35dd..4578c6aa 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=IRK74 From bdf74fed0c5ac5e69cb5de482e474eb65a6d369b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 12 Sep 2011 16:24:47 -0700 Subject: [PATCH 204/349] IRK74B --- 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 4578c6aa..787cda0b 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=IRK74 +export BUILD_ID=IRK74B From 3fc593005affdf170569da6e5d907cbf995f3b2a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Sep 2011 06:36:38 -0700 Subject: [PATCH 205/349] IRK75 --- 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 40bb35dd..095b689b 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=IRK75 From e144d90319f0ca7b46f34abc4ad1650f3ca66dea Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Sep 2011 14:30:20 -0700 Subject: [PATCH 206/349] IRK75B --- 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 095b689b..20bf1bc3 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=IRK75 +export BUILD_ID=IRK75B From 9d8af8a16182c829a4361c4e7bae7199db0ee5f8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Sep 2011 17:45:41 -0700 Subject: [PATCH 207/349] IRK75C --- 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 20bf1bc3..6a8fc53e 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=IRK75B +export BUILD_ID=IRK75C From 7136a4c1753a999772b0f83a823e1d04db78f666 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Sep 2011 06:36:55 -0700 Subject: [PATCH 208/349] IRK76 --- 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 40bb35dd..7c13390b 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=IRK76 From 4b01e41bc059762bdb881fe1fbd4b8bac4c7ec2b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Sep 2011 16:59:01 -0700 Subject: [PATCH 209/349] IRK76B --- 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 7c13390b..363ea3ba 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=IRK76 +export BUILD_ID=IRK76B From e318b57b43d3072f209febe9e1bc3c691a747d1e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Sep 2011 19:57:28 -0700 Subject: [PATCH 210/349] IRK76C --- 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 363ea3ba..fada6e62 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=IRK76B +export BUILD_ID=IRK76C From 040dcb6ab075bf613c6f7f4e47e35f9c99d39165 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Sep 2011 06:37:19 -0700 Subject: [PATCH 211/349] IRK77 --- 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 40bb35dd..e5f1fe17 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=IRK77 From fd060bf01ab50a9b14fe236b0806c1ebd32db757 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Sep 2011 11:44:14 -0700 Subject: [PATCH 212/349] IRK77C --- 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 e5f1fe17..f14a42ef 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=IRK77 +export BUILD_ID=IRK77C From 5a1322d1681c09d5d11d079b69d0c1374d3f3edc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 18 Sep 2011 07:03:41 -0700 Subject: [PATCH 213/349] IRK80 --- 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 e415e8db..edddeb4d 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=IRK80 From 6d21a2c98479f02ad6d8a394eaa5cb881839dfb8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 18 Sep 2011 16:29:04 -0700 Subject: [PATCH 214/349] IRK80B --- 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 edddeb4d..4393e68e 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=IRK80 +export BUILD_ID=IRK80B From f09317f7e64c4a4e8ac266ed17643c63aa46ad8a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 19 Sep 2011 07:02:17 -0700 Subject: [PATCH 215/349] IRK81 --- 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 e415e8db..7ce80ed4 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=IRK81 From e88bbf731f1dd7153a2826cde8ea34390b73bfca Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 19 Sep 2011 15:08:56 -0700 Subject: [PATCH 216/349] IRK81B --- 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 7ce80ed4..2f355aa5 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=IRK81 +export BUILD_ID=IRK81B From 1640b3f69710f4e3a17e17b805972c330821532d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Sep 2011 07:02:50 -0700 Subject: [PATCH 217/349] IRK82 --- 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 e415e8db..73b0ea6e 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=IRK82 From fd619aeec9ebe9da6f03d7fd1a2b891c30a8e636 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Sep 2011 12:35:07 -0700 Subject: [PATCH 218/349] IRK82B --- 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 73b0ea6e..d5d264eb 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=IRK82 +export BUILD_ID=IRK82B From 6006cf89ddde20f1888f109d7b50fa3a066b6b68 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 21 Sep 2011 07:02:42 -0700 Subject: [PATCH 219/349] IRK83 --- 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 e415e8db..52c1d513 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=IRK83 From 9529e25e8e23fcaad1e8cb45c805f09eb2e36fed Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 22 Sep 2011 07:02:19 -0700 Subject: [PATCH 220/349] IRK84 --- 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 e415e8db..6b6d33ea 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=IRK84 From 03b540eee5cf74017919fefaf3fc86def39ac13d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 22 Sep 2011 18:25:49 -0700 Subject: [PATCH 221/349] IRK84B --- 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 6b6d33ea..483b1ddd 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=IRK84 +export BUILD_ID=IRK84B From 4c82ad2b6e6d9a5bc4f7e1509257723995e14335 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 25 Sep 2011 07:02:48 -0700 Subject: [PATCH 222/349] IRK87 --- 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 e415e8db..13414cc1 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=IRK87 From e7e1d1abbfb345505e3fd4a0f654a9093dc89fd2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 25 Sep 2011 18:14:52 -0700 Subject: [PATCH 223/349] IRK87B --- 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 13414cc1..152c5b46 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=IRK87 +export BUILD_ID=IRK87B From d5eb49552168dc636584ebe4dcd9653e0fd94648 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 26 Sep 2011 07:01:12 -0700 Subject: [PATCH 224/349] IRK88 --- 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 e415e8db..daab27b5 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=IRK88 From a11ebf672f250b8c73fc51ee3f716a3fd7a19d73 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 26 Sep 2011 16:13:38 -0700 Subject: [PATCH 225/349] IRK88B --- 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 daab27b5..461166dd 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=IRK88 +export BUILD_ID=IRK88B From 60e3db3352361d99ab1aeb1c00fbee0750cce5a4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 27 Sep 2011 07:01:59 -0700 Subject: [PATCH 226/349] IRK89 --- 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 e415e8db..b0a519e7 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=IRK89 From b27b4efdad37b2e0df60b71f60b11e6265ec04f9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 28 Sep 2011 07:12:03 -0700 Subject: [PATCH 227/349] IRK90 --- 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 e415e8db..1bf31c65 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=IRK90 From 65289329bd71313d105627f2df2723a7441b83c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 28 Sep 2011 17:59:45 -0700 Subject: [PATCH 228/349] IRK90B --- 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 e415e8db..647a3fbb 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=IRK90B From 917f3f0e1710f72eeb6a981a36e629c172e84377 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Sep 2011 07:01:14 -0700 Subject: [PATCH 229/349] IRK91 --- 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 e415e8db..35d91294 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=IRK91 From 4da20bfd2d79181a1d1aeef44fa5c79b03c2305d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Sep 2011 09:13:30 -0700 Subject: [PATCH 230/349] IRK91B --- 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 35d91294..e6cbd48d 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=IRK91 +export BUILD_ID=IRK91B From 77bf58088a69bc135be08ab86c2bf903a58f51d6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 29 Sep 2011 16:21:47 -0700 Subject: [PATCH 231/349] IRK91C --- 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 e6cbd48d..6ee7cf0a 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=IRK91B +export BUILD_ID=IRK91C From 9360c56331d4eef81fc4c3b648fba19c917d8f79 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 30 Sep 2011 06:46:48 -0700 Subject: [PATCH 232/349] IRK92 --- 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 e415e8db..54863335 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=IRK92 From c152e8a75dd29ec6fb3c6778e0d93bb3db6e3f0e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 30 Sep 2011 14:22:59 -0700 Subject: [PATCH 233/349] IRK92B --- 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 54863335..3232f439 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=IRK92 +export BUILD_ID=IRK92B From 935d5e971000ee2d6471ec7efd9259b3094be3c1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Oct 2011 07:02:44 -0700 Subject: [PATCH 234/349] IRL03 --- 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 e415e8db..44b93180 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=IRL03 From 3aff8d7acaa3f75bb18a99aa5e94d7439f5cfd4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Oct 2011 15:59:04 -0700 Subject: [PATCH 235/349] IRL03B --- 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 44b93180..fe6c39f7 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=IRL03 +export BUILD_ID=IRL03B From f5b9e998b7b52c29196de44ddfd676f595f8093b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Oct 2011 07:02:58 -0700 Subject: [PATCH 236/349] IRL04 --- 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 e415e8db..b8a1ef2b 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=IRL04 From cf0db94c87b2b3beca5cbf6b769fff73ed91c4d4 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 4 Oct 2011 10:50:08 -0700 Subject: [PATCH 237/349] Support for product-specific dev keys. Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f --- core/Makefile | 15 ++++++++------- core/config.mk | 7 +++++++ core/package.mk | 8 ++++---- core/prebuilt.mk | 4 ++-- core/product.mk | 7 ++++++- core/product_config.mk | 37 +++++++++++++++++++++++-------------- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/core/Makefile b/core/Makefile index a49850ef..cfa1fbbb 100644 --- a/core/Makefile +++ b/core/Makefile @@ -71,9 +71,9 @@ BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS) ifeq ($(TARGET_BUILD_TYPE),debug) BUILD_VERSION_TAGS += debug endif -# Apps are always signed with test keys, and may be re-signed in a post-build -# step. If that happens, the "test-keys" tag will be removed by that step. -BUILD_VERSION_TAGS += test-keys +# Apps are always signed with dev keys, and may be re-signed in a post-build +# step. If that happens, the "dev-keys" tag will be removed by that step. +BUILD_VERSION_TAGS += dev-keys BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) # A human-readable string that descibes this build in detail. @@ -260,11 +260,11 @@ endif # ----------------------------------------------------------------- -# The test key is used to sign this package, and as the key required +# The dev key is used to sign this package, and as the key required # for future OTA packages installed by this system. Actual product # deliverables will be re-signed by hand. We expect this file to # exist with the suffixes ".x509.pem" and ".pk8". -DEFAULT_KEY_CERT_PAIR := $(SRC_TARGET_DIR)/product/security/testkey +DEFAULT_KEY_CERT_PAIR := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) # Rules that need to be present for the all targets, even @@ -651,9 +651,9 @@ ifdef BOARD_KERNEL_PAGESIZE endif # Keys authorized to sign OTA packages this build will accept. The -# build always uses test-keys for this; release packaging tools will +# build always uses dev-keys for this; release packaging tools will # substitute other keys for this one. -OTA_PUBLIC_KEYS := $(SRC_TARGET_DIR)/product/security/testkey.x509.pem +OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem # Generate a file containing the keys that will be read by the # recovery binary. @@ -1100,6 +1100,7 @@ endif ifdef INTERNAL_USERIMAGES_SPARSE_EXT_FLAG $(hide) echo "extfs_sparse_flag=$(INTERNAL_USERIMAGES_SPARSE_EXT_FLAG)" >> $(zip_root)/META/misc_info.txt endif + $(hide) echo "default_system_dev_certificate=$(DEFAULT_SYSTEM_DEV_CERTIFICATE)" >> $(zip_root)/META/misc_info.txt ifdef PRODUCT_EXTRA_RECOVERY_KEYS $(hide) echo "extra_recovery_keys=$(PRODUCT_EXTRA_RECOVERY_KEYS)" >> $(zip_root)/META/misc_info.txt endif diff --git a/core/config.mk b/core/config.mk index c4f08fd0..41e60ea1 100644 --- a/core/config.mk +++ b/core/config.mk @@ -288,6 +288,13 @@ APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/doclava$( APICHECK_CLASSPATH := $(APICHECK_CLASSPATH):$(HOST_OUT_JAVA_LIBRARIES)/jsilver$(COMMON_JAVA_PACKAGE_SUFFIX) APICHECK_COMMAND := $(APICHECK) -JXmx1024m -J"classpath $(APICHECK_CLASSPATH)" +# The default key if not set as LOCAL_CERTIFICATE +ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE + DEFAULT_SYSTEM_DEV_CERTIFICATE := $(PRODUCT_DEFAULT_DEV_CERTIFICATE) +else + DEFAULT_SYSTEM_DEV_CERTIFICATE := build/target/product/security/testkey +endif + # ############################################################### # Set up final options. # ############################################################### diff --git a/core/package.mk b/core/package.mk index 9f54bb07..398e487d 100644 --- a/core/package.mk +++ b/core/package.mk @@ -304,20 +304,20 @@ endif # Secure release builds will have their packages signed after the fact, # so it's ok for these private keys to be in the clear. ifeq ($(LOCAL_CERTIFICATE),) - LOCAL_CERTIFICATE := testkey + LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) endif ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) # The special value "EXTERNAL" means that we will sign it with the - # default testkey, apply predexopt, but then expect the final .apk + # default devkey, apply predexopt, but then expect the final .apk # (after dexopting) to be signed by an outside tool. - LOCAL_CERTIFICATE := testkey + LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) PACKAGES.$(LOCAL_PACKAGE_NAME).EXTERNAL_KEY := 1 endif # If this is not an absolute certificate, assign it to a generic one. ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) - LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE) + LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) endif private_key := $(LOCAL_CERTIFICATE).pk8 certificate := $(LOCAL_CERTIFICATE).x509.pem diff --git a/core/prebuilt.mk b/core/prebuilt.mk index 935bce1f..8c033416 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -93,7 +93,7 @@ ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) # # This can be used for packages where we don't have access to the # keys, but want the package to be predexopt'ed. - LOCAL_CERTIFICATE := testkey + LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) PACKAGES.$(LOCAL_MODULE).EXTERNAL_KEY := 1 endif ifeq ($(LOCAL_CERTIFICATE),) @@ -114,7 +114,7 @@ else ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) else # If this is not an absolute certificate, assign it to a generic one. ifeq ($(dir $(strip $(LOCAL_CERTIFICATE))),./) - LOCAL_CERTIFICATE := $(SRC_TARGET_DIR)/product/security/$(LOCAL_CERTIFICATE) + LOCAL_CERTIFICATE := $(dir $(DEFAULT_SYSTEM_DEV_CERTIFICATE))$(LOCAL_CERTIFICATE) endif PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 diff --git a/core/product.mk b/core/product.mk index 2efc4464..72cb2f7a 100644 --- a/core/product.mk +++ b/core/product.mk @@ -82,7 +82,9 @@ _product_var_list := \ PRODUCT_SDK_ADDON_COPY_FILES \ PRODUCT_SDK_ADDON_COPY_MODULES \ PRODUCT_SDK_ADDON_DOC_MODULE \ - PRODUCT_DEFAULT_WIFI_CHANNELS + PRODUCT_DEFAULT_WIFI_CHANNELS \ + PRODUCT_DEFAULT_DEV_CERTIFICATE \ + define dump-product $(info ==== $(1) ====)\ @@ -232,6 +234,9 @@ _product_stash_var_list += \ BOARD_INSTALLER_CMDLINE \ +_product_stash_var_list += \ + DEFAULT_SYSTEM_DEV_CERTIFICATE + # # Stash vaues of the variables in _product_stash_var_list. # $(1): Renamed prefix diff --git a/core/product_config.mk b/core/product_config.mk index 1567f6d8..e673d5ca 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -112,8 +112,8 @@ ifdef product_goals # The build server wants to do make PRODUCT-dream-installclean # which really means TARGET_PRODUCT=dream make installclean. ifneq ($(filter-out $(INTERNAL_VALID_VARIANTS),$(TARGET_BUILD_VARIANT)),) - MAKECMDGOALS := $(MAKECMDGOALS) $(TARGET_BUILD_VARIANT) - TARGET_BUILD_VARIANT := eng + MAKECMDGOALS := $(MAKECMDGOALS) $(TARGET_BUILD_VARIANT) + TARGET_BUILD_VARIANT := eng default_goal_substitution := else default_goal_substitution := $(DEFAULT_GOAL) @@ -232,8 +232,8 @@ PRODUCT_AAPT_CONFIG := $(PRODUCT_LOCALES) $(PRODUCT_AAPT_CONFIG) # Default to medium-density assets. # (Can be overridden in the device config, e.g.: PRODUCT_AAPT_CONFIG += hdpi) PRODUCT_AAPT_CONFIG := $(strip \ - $(PRODUCT_AAPT_CONFIG) \ - $(if $(filter %dpi,$(PRODUCT_AAPT_CONFIG)),,mdpi)) + $(PRODUCT_AAPT_CONFIG) \ + $(if $(filter %dpi,$(PRODUCT_AAPT_CONFIG)),,mdpi)) # Everyone gets nodpi assets which are density-independent. PRODUCT_AAPT_CONFIG += nodpi @@ -241,7 +241,7 @@ PRODUCT_AAPT_CONFIG += nodpi # Convert spaces to commas. comma := , PRODUCT_AAPT_CONFIG := \ - $(subst $(space),$(comma),$(strip $(PRODUCT_AAPT_CONFIG))) + $(subst $(space),$(comma),$(strip $(PRODUCT_AAPT_CONFIG))) PRODUCT_BRAND := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BRAND)) @@ -251,7 +251,7 @@ ifndef PRODUCT_MODEL endif PRODUCT_MANUFACTURER := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MANUFACTURER)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_MANUFACTURER)) ifndef PRODUCT_MANUFACTURER PRODUCT_MANUFACTURER := unknown endif @@ -263,7 +263,16 @@ else endif PRODUCT_DEFAULT_WIFI_CHANNELS := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_WIFI_CHANNELS)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_WIFI_CHANNELS)) + +PRODUCT_DEFAULT_DEV_CERTIFICATE := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_DEV_CERTIFICATE)) +ifdef PRODUCT_DEFAULT_DEV_CERTIFICATE +ifneq (1,$(words $(PRODUCT_DEFAULT_DEV_CERTIFICATE))) + $(error PRODUCT_DEFAULT_DEV_CERTIFICATE='$(PRODUCT_DEFAULT_DEV_CERTIFICATE)', \ + only 1 certificate is allowed.) +endif +endif # A list of words like :. The file at # the source path should be copied to the destination path when building @@ -271,26 +280,26 @@ PRODUCT_DEFAULT_WIFI_CHANNELS := \ # it should look like, e.g., "system/etc/file.xml". The rules # for these copy steps are defined in config/Makefile. PRODUCT_COPY_FILES := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COPY_FILES)) # The HTML file containing the contributors to the project. PRODUCT_CONTRIBUTORS_FILE := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CONTRIBUTORS_FILE)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_CONTRIBUTORS_FILE)) # A list of property assignments, like "key = value", with zero or more # whitespace characters on either side of the '='. PRODUCT_PROPERTY_OVERRIDES := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES)) # A list of property assignments, like "key = value", with zero or more # whitespace characters on either side of the '='. # used for adding properties to default.prop PRODUCT_DEFAULT_PROPERTY_OVERRIDES := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEFAULT_PROPERTY_OVERRIDES)) # Should we use the default resources or add any product specific overlays PRODUCT_PACKAGE_OVERLAYS := \ - $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS)) + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGE_OVERLAYS)) DEVICE_PACKAGE_OVERLAYS := \ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).DEVICE_PACKAGE_OVERLAYS)) @@ -299,8 +308,8 @@ PRODUCT_TAGS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_TAGS)) # Add the product-defined properties to the build properties. ADDITIONAL_BUILD_PROPERTIES := \ - $(ADDITIONAL_BUILD_PROPERTIES) \ - $(PRODUCT_PROPERTY_OVERRIDES) + $(ADDITIONAL_BUILD_PROPERTIES) \ + $(PRODUCT_PROPERTY_OVERRIDES) # The OTA key(s) specified by the product config, if any. The names # of these keys are stored in the target-files zip so that post-build From 17e6c01f406fdb23e7a1601fc60da19dc362f1d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Oct 2011 16:17:46 -0700 Subject: [PATCH 238/349] IRL04B --- 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 b8a1ef2b..5ac142ab 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=IRL04 +export BUILD_ID=IRL04B From a518f7e7553b6392b6cd24f8fd405a7c2a45caa2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 4 Oct 2011 21:36:57 -0700 Subject: [PATCH 239/349] IRL04C --- 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 5ac142ab..ce72fb45 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=IRL04B +export BUILD_ID=IRL04C From 7f0b38e34d7eb973b8fda743f767baf14a20d028 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Oct 2011 07:01:00 -0700 Subject: [PATCH 240/349] IRL05 --- 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 e415e8db..d4bd8693 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=IRL05 From 45c8c4901e9ad03a0fd920bb73deaab665183829 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Wed, 5 Oct 2011 08:16:30 -0700 Subject: [PATCH 241/349] sign non-PRESIGNED prebuilt apks Since dev keys can now vary per device, we can't assume they are checked in with the correct signature. Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798 --- core/prebuilt.mk | 82 ++++++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 34 deletions(-) diff --git a/core/prebuilt.mk b/core/prebuilt.mk index 8c033416..54a7fa9f 100644 --- a/core/prebuilt.mk +++ b/core/prebuilt.mk @@ -54,47 +54,18 @@ endif PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) -# Ensure that prebuilt .apks have been aligned. -ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) -$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN) - $(transform-prebuilt-to-target-with-zipalign) -else -ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) -$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) - $(transform-prebuilt-to-target-strip-comments) -else -$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) - $(transform-prebuilt-to-target) -endif -endif - -ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) -# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir, -# while the deps should be in the common dir, so we make a copy in the common dir. -# For nonstatic library, $(common_javalib_jar) is the dependency file, -# while $(common_classes_jar) is used to link. -common_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jar -common_javalib_jar := $(dir $(common_classes_jar))javalib.jar - -$(common_classes_jar) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) - $(transform-prebuilt-to-target) - -$(common_javalib_jar) : $(common_classes_jar) | $(ACP) - $(transform-prebuilt-to-target) - -# make sure the classes.jar and javalib.jar are built before $(LOCAL_BUILT_MODULE) -$(built_module) : $(common_javalib_jar) -endif # TARGET JAVA_LIBRARIES - ifeq ($(LOCAL_CERTIFICATE),EXTERNAL) # The magic string "EXTERNAL" means this package will be signed with - # the test key throughout the build process, but we expect the final - # package to be signed with a different key. + # the default dev key throughout the build process, but we expect + # the final package to be signed with a different key. # # This can be used for packages where we don't have access to the # keys, but want the package to be predexopt'ed. LOCAL_CERTIFICATE := $(DEFAULT_SYSTEM_DEV_CERTIFICATE) PACKAGES.$(LOCAL_MODULE).EXTERNAL_KEY := 1 + + $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 + $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem endif ifeq ($(LOCAL_CERTIFICATE),) ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) @@ -120,8 +91,51 @@ else PACKAGES.$(LOCAL_MODULE).PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 PACKAGES.$(LOCAL_MODULE).CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem PACKAGES := $(PACKAGES) $(LOCAL_MODULE) + + $(built_module) : PRIVATE_PRIVATE_KEY := $(LOCAL_CERTIFICATE).pk8 + $(built_module) : PRIVATE_CERTIFICATE := $(LOCAL_CERTIFICATE).x509.pem endif +ifneq ($(filter APPS,$(LOCAL_MODULE_CLASS)),) +ifeq ($(LOCAL_CERTIFICATE),PRESIGNED) +# Ensure that presigned .apks have been aligned. +$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ZIPALIGN) + $(transform-prebuilt-to-target-with-zipalign) +else +# Sign and align non-presigned .apks. +$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) $(ZIPALIGN) $(SIGNAPK_JAR) + $(transform-prebuilt-to-target) + $(sign-package) + $(align-package) +endif +else +ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),) +$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) + $(transform-prebuilt-to-target-strip-comments) +else +$(built_module) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) + $(transform-prebuilt-to-target) +endif +endif + +ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) +# for target java libraries, the LOCAL_BUILT_MODULE is in a product-specific dir, +# while the deps should be in the common dir, so we make a copy in the common dir. +# For nonstatic library, $(common_javalib_jar) is the dependency file, +# while $(common_classes_jar) is used to link. +common_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,$(LOCAL_MODULE),,COMMON)/classes.jar +common_javalib_jar := $(dir $(common_classes_jar))javalib.jar + +$(common_classes_jar) : $(LOCAL_PATH)/$(LOCAL_SRC_FILES) | $(ACP) + $(transform-prebuilt-to-target) + +$(common_javalib_jar) : $(common_classes_jar) | $(ACP) + $(transform-prebuilt-to-target) + +# make sure the classes.jar and javalib.jar are built before $(LOCAL_BUILT_MODULE) +$(built_module) : $(common_javalib_jar) +endif # TARGET JAVA_LIBRARIES + ifneq ($(prebuilt_module_is_a_library),) ifneq ($(LOCAL_IS_HOST_MODULE),) $(transform-host-ranlib-copy-hack) From 8898d77418e0659de8814f4744711d0d6a7fb9fe Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Wed, 5 Oct 2011 11:23:06 -0700 Subject: [PATCH 242/349] add missing parameter to ReplaceOtaKeys Change-Id: Ib596235a8e3b3588d363fea82b92b69895ee5408 --- tools/releasetools/sign_target_files_apks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks index bc88ef87..eaad8a4c 100755 --- a/tools/releasetools/sign_target_files_apks +++ b/tools/releasetools/sign_target_files_apks @@ -336,7 +336,7 @@ def main(argv): SignApks(input_zip, output_zip, apk_key_map, key_passwords) if OPTIONS.replace_ota_keys: - ReplaceOtaKeys(input_zip, output_zip) + ReplaceOtaKeys(input_zip, output_zip, misc_info) input_zip.close() output_zip.close() From e17f3f2b9e2069ee54bc24043881bf3ca14a2a05 Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Wed, 5 Oct 2011 12:41:56 -0700 Subject: [PATCH 243/349] fix build fingerprint: dev-keys vs test-keys The fingerprint should only say dev-keys if it's actually using custom keys; builds with the old default (from build/target/product/security) should still say test-keys. Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc --- core/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index eb4c7622..a81c981f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -77,9 +77,16 @@ BUILD_VERSION_TAGS := $(BUILD_VERSION_TAGS) ifeq ($(TARGET_BUILD_TYPE),debug) BUILD_VERSION_TAGS += debug endif -# Apps are always signed with dev keys, and may be re-signed in a post-build -# step. If that happens, the "dev-keys" tag will be removed by that step. +# The "test-keys" tag marks builds signed with the old test keys, +# which are available in the SDK. "dev-keys" marks builds signed with +# non-default dev keys (usually private keys from a vendor directory). +# Both of these tags will be removed and replaced with "release-keys" +# when the target-files is signed in a post-build step. +ifeq ($(DEFAULT_SYSTEM_DEV_CERTIFICATE),build/target/product/security/testkey) +BUILD_VERSION_TAGS += test-keys +else BUILD_VERSION_TAGS += dev-keys +endif BUILD_VERSION_TAGS := $(subst $(space),$(comma),$(sort $(BUILD_VERSION_TAGS))) # A human-readable string that descibes this build in detail. From 8e79fa2bb5d39342ca5204f206737603364aff6e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Oct 2011 16:31:30 -0700 Subject: [PATCH 244/349] IRL05B --- 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 d4bd8693..7caacad5 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=IRL05 +export BUILD_ID=IRL05B From 25e5a276ca7f72ceba8bb0aff8bb124908204232 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Oct 2011 07:03:50 -0700 Subject: [PATCH 245/349] IRL06 --- 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 e415e8db..6b653a37 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=IRL06 From 3dc23f8ff39a4b812a4c777129115efbb30f131b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Oct 2011 14:19:17 -0700 Subject: [PATCH 246/349] IRL06B --- 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 6b653a37..7ca730d9 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=IRL06 +export BUILD_ID=IRL06B From 34d4f8362ee00d0e638d99fd238d8f6c4c673e5c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Oct 2011 17:23:06 -0700 Subject: [PATCH 247/349] IRL06C --- 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 7ca730d9..a6335b25 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=IRL06B +export BUILD_ID=IRL06C From 65a32306b67e5d0fbe89b41ff3bbb992c9099d75 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Oct 2011 07:03:14 -0700 Subject: [PATCH 248/349] IRL09 --- 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 e415e8db..73dadcd2 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=IRL09 From a39c920b08437d4bef7c149f20df58372c2f143f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Oct 2011 13:42:49 -0700 Subject: [PATCH 249/349] IRL09B --- 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 73dadcd2..98bbfc53 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=IRL09 +export BUILD_ID=IRL09B From 6f9c29bf46b89a9296fe1ca1207c9a39721c34cd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Oct 2011 07:01:59 -0700 Subject: [PATCH 250/349] IRL10 --- 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 e415e8db..7dc36830 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=IRL10 From 0425074303d3fa0ff25e4659b40f969784cad9b0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Oct 2011 14:17:14 -0700 Subject: [PATCH 251/349] IRL10B --- 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 7dc36830..416eac95 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=IRL10 +export BUILD_ID=IRL10B From 63ee44f5f434a64b877e4d0cb32f8d8e9d6f2a6b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Oct 2011 05:35:51 -0700 Subject: [PATCH 252/349] IRL11 --- 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 e415e8db..92a682f3 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=IRL11 From c8795dd0ba741c6f1e1177fb525c5700d4723f59 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Oct 2011 07:02:51 -0700 Subject: [PATCH 253/349] IRL12 --- 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 6da16e05..a9c99224 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=IRL12 From 2a4a8015199dcbee0e87e55cbff015b66dc93885 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Oct 2011 14:55:18 -0700 Subject: [PATCH 254/349] IRL12B --- 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 a9c99224..6f3a137c 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=IRL12 +export BUILD_ID=IRL12B From fd719c828473fb960cb7c6229ed4e3e50657bbc8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Oct 2011 15:16:16 -0700 Subject: [PATCH 255/349] IRL12C --- 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 6f3a137c..3c85b2f3 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=IRL12B +export BUILD_ID=IRL12C From 256323a1eb960454c07a5ffac0ee9a76a12ba4ef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Oct 2011 07:02:18 -0700 Subject: [PATCH 256/349] IRL13 --- 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 6da16e05..a68a3f09 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=IRL13 From f00efe5650b0b5167fa03b95886d3751e4a30cda Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 14 Oct 2011 17:32:28 -0700 Subject: [PATCH 257/349] IRL14 --- 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 a68a3f09..3e58a0db 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=IRL13 +export BUILD_ID=IRL14 From da84b9a8b702bfa07775c70647162e2bb96f91f2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 16 Oct 2011 07:02:14 -0700 Subject: [PATCH 258/349] IRL16 --- 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 6da16e05..c9476d95 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=IRL16 From 429a2b6d91d2c3f25ccc718de9dbe555625cd68d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Oct 2011 07:01:54 -0700 Subject: [PATCH 259/349] IRL17 --- 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 6da16e05..72d29c2d 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=IRL17 From 78e57dfa10ddec05198ca5c97fa8e188281cc827 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Oct 2011 07:03:38 -0700 Subject: [PATCH 260/349] IRL18 --- 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 6da16e05..5e02e6f0 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=IRL18 From 607825421b0243aaa5298d2090aa933a06a9e197 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 19 Oct 2011 07:45:48 -0700 Subject: [PATCH 261/349] IRL19 --- 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 6da16e05..bc5d7134 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=IRL19 From c763b5265532573613802b661a333e249219dcc9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Oct 2011 07:04:36 -0700 Subject: [PATCH 262/349] IRL20 --- 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 6da16e05..23718010 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=IRL20 From 25de8de62ec86f6eb90d674a51db7881d0831ed1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 23 Oct 2011 07:05:16 -0700 Subject: [PATCH 263/349] IRL23 --- 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 40bb35dd..94fd2763 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=IRL23 From ecb49e9f8561af9a0c269270bc1c32fa4049fbed Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Oct 2011 07:33:44 -0700 Subject: [PATCH 264/349] IRL24 --- 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 40bb35dd..d1c84df5 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=IRL24 From 1a7e403a348c21f4c41d42b9d6fd1fe4dfb7ef23 Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Tue, 25 Oct 2011 07:01:22 -0700 Subject: [PATCH 265/349] IML24 Change-Id: I442d25bdc313f4b034ad9995fb8891bb84507943 --- 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 d1c84df5..09234416 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=IRL24 +export BUILD_ID=IML24 From 8e2412684803e2e82db965e7c145aa605edbf668 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Oct 2011 07:06:03 -0700 Subject: [PATCH 266/349] IML26 --- 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 70bd2351..edd64ef5 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 := MR1 -# 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=IML26 From 9dc3738e7999e344a5f5def3cc9c36da3d483b10 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Oct 2011 06:49:14 -0700 Subject: [PATCH 267/349] IML27 --- 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 70bd2351..74f82f33 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 := MR1 -# 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=IML27 From bf03e8074017c2ad7acd29e52cc5e8a34ac28169 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Oct 2011 18:27:30 -0700 Subject: [PATCH 268/349] IML27B --- 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 74f82f33..0806d1a4 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=IML27 +export BUILD_ID=IML27B From ecf4ddf6bcd4f78e6e51d3d923cf5ef338ef76dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Oct 2011 16:19:56 -0700 Subject: [PATCH 269/349] IML27C --- 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 0806d1a4..3c60b0be 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=IML27B +export BUILD_ID=IML27C From f4abc556776629d0ba9f07427972760f77ef9b80 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 30 Oct 2011 06:50:58 -0700 Subject: [PATCH 270/349] IML30 --- 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 70bd2351..165c9a0f 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 := MR1 -# 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=IML30 From 310ec041a4aa788c29b0f69d32e9c7f8309b1deb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 31 Oct 2011 06:47:46 -0700 Subject: [PATCH 271/349] IML31 --- 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 70bd2351..344ffb89 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 := MR1 -# 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=IML31 From f5702953c51fe0b307e3cb786caeda888e5fd309 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 31 Oct 2011 16:31:05 -0700 Subject: [PATCH 272/349] IML31B --- 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 344ffb89..b499f00d 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=IML31 +export BUILD_ID=IML31B From e573b72204509d1979c3805df0e245bb8e927e0e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Nov 2011 06:47:37 -0700 Subject: [PATCH 273/349] IML32 --- 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 70bd2351..b77f7a22 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 := MR1 -# 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=IML32 From c24e8f5e7fa6133f05e97aa5b2de731351e99722 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 1 Nov 2011 17:34:07 -0700 Subject: [PATCH 274/349] IML32B --- 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 b77f7a22..d0d85e6d 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=IML32 +export BUILD_ID=IML32B From f33a8509eb5f109790906b83fa18a7d694224c0a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Nov 2011 06:48:34 -0700 Subject: [PATCH 275/349] IML33 --- 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 70bd2351..bacb2753 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 := MR1 -# 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=IML33 From beaeeab3a499af4fa0aba8d89e4ccb67d10c3acb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Nov 2011 07:46:08 -0700 Subject: [PATCH 276/349] IML33B --- 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 70bd2351..a6bb1853 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 := MR1 -# 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=IML33B From 29c554f5cc962b84e760d47e07e91e70b1a34c6f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 2 Nov 2011 16:13:27 -0700 Subject: [PATCH 277/349] IML33C --- 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 a6bb1853..a76e2078 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=IML33B +export BUILD_ID=IML33C From e43361e82c92dc64e135c069a62654f08d00c8f2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Nov 2011 06:46:08 -0700 Subject: [PATCH 278/349] IML34 --- 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 70bd2351..79423e4b 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 := MR1 -# 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=IML34 From 3d8ebbe242d2af34d5935336a7068fcf33f1ccf4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 3 Nov 2011 21:12:34 -0700 Subject: [PATCH 279/349] IML34B --- 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 79423e4b..a5e2def9 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=IML34 +export BUILD_ID=IML34B From 523c5f77248ee8800aed19b9035793c2436e86cb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 6 Nov 2011 06:48:33 -0800 Subject: [PATCH 280/349] IML37 --- 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 70bd2351..f8782581 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 := MR1 -# 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=IML37 From 441bd3de1c223b9ebdf81f8637f81a6bc8955cf2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 7 Nov 2011 06:47:11 -0800 Subject: [PATCH 281/349] IML38 --- 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 70bd2351..cdeacb54 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 := MR1 -# 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=IML38 From f6d868b5f36696793ed377cc36ca8b36477a74ec Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 7 Nov 2011 14:55:07 -0800 Subject: [PATCH 282/349] IML38B --- 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 cdeacb54..27c37d82 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=IML38 +export BUILD_ID=IML38B From 7568e5721bd37eba1bf9b67d00b9bfb2251c7335 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 8 Nov 2011 06:47:41 -0800 Subject: [PATCH 283/349] IML39 --- 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 70bd2351..843709ca 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 := MR1 -# 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=IML39 From 2a4b47454688396346460b7d7d21e0e63aba2195 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 9 Nov 2011 06:49:08 -0800 Subject: [PATCH 284/349] IML40 --- 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 70bd2351..99be5d77 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 := MR1 -# 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=IML40 From 8059e433e6ad4f1d6cdf4800a4af68730fd0fb7d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 9 Nov 2011 10:07:31 -0800 Subject: [PATCH 285/349] IML40B --- 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 70bd2351..2bb28238 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 := MR1 -# 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=IML40B From 5a389be866e5ddbc090bef3b0c3c4879400203f6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 10 Nov 2011 06:48:52 -0800 Subject: [PATCH 286/349] IML41 --- 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 70bd2351..ae845ee5 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 := MR1 -# 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=IML41 From 376271ad4c668137b1c6c23734aaeda344b344fb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 10 Nov 2011 16:33:24 -0800 Subject: [PATCH 287/349] IML41B --- 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 ae845ee5..c0deb1f8 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=IML41 +export BUILD_ID=IML41B From 06a3868721d2e02ed79773e6c49bfcd5ebc073a7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 10 Nov 2011 17:35:49 -0800 Subject: [PATCH 288/349] IML41C --- 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 c0deb1f8..c52e70ee 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=IML41B +export BUILD_ID=IML41C From 4af7c720304b0068c2c37a7e2a73f81602e0f7d3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 11 Nov 2011 11:51:55 -0800 Subject: [PATCH 289/349] IML41D --- 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 c52e70ee..348a4f58 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=IML41C +export BUILD_ID=IML41D From a94b67aaca0f076a25c79144e57865a1c8376287 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 13 Nov 2011 06:49:16 -0800 Subject: [PATCH 290/349] IML44 --- 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 70bd2351..2a48c0fd 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 := MR1 -# 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=IML44 From 3a8d25289daf9539488df711ce529204dd39e0df Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 14 Nov 2011 06:47:12 -0800 Subject: [PATCH 291/349] IML45 --- 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 70bd2351..8954db87 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 := MR1 -# 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=IML45 From 98dfb2763f4b764c074fa7db9fbd3578de0e2d56 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 14 Nov 2011 16:00:14 -0800 Subject: [PATCH 292/349] IML45B --- 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 8954db87..96a04834 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=IML45 +export BUILD_ID=IML45B From 06ab0ffdc3028469088e406a6ad19160e8fcc9c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Nov 2011 06:47:51 -0800 Subject: [PATCH 293/349] IML46 --- 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 70bd2351..0f539ea8 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 := MR1 -# 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=IML46 From 3ae4c921b237e2b86d7be8f24bec949847873e97 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 15 Nov 2011 16:19:56 -0800 Subject: [PATCH 294/349] IML46B --- 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 0f539ea8..b15976b6 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=IML46 +export BUILD_ID=IML46B From e66e3413ff2dac9b091be0dab2090d5224a2fc16 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Nov 2011 06:48:43 -0800 Subject: [PATCH 295/349] IML47 --- 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 70bd2351..4fc0b7ef 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 := MR1 -# 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=IML47 From 19adeff1bb54164b26e182f371fe647d7c2990ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 16 Nov 2011 16:29:26 -0800 Subject: [PATCH 296/349] IML47B --- 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 4fc0b7ef..aaea1537 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=IML47 +export BUILD_ID=IML47B From d51de46758bc704e8035ec5567a75e719905cce1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Nov 2011 06:48:58 -0800 Subject: [PATCH 297/349] IML48 --- 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 70bd2351..8501ca7c 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 := MR1 -# 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=IML48 From d23e92b201af5d0933fce302290fc0dcf8607370 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 17 Nov 2011 16:41:53 -0800 Subject: [PATCH 298/349] IML48B --- 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 8501ca7c..08d50aed 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=IML48 +export BUILD_ID=IML48B From 1b87ad32c36e1aa37099314f440d59240cef5c1d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 18 Nov 2011 12:45:55 -0800 Subject: [PATCH 299/349] IML48C --- 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 08d50aed..00f98622 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=IML48B +export BUILD_ID=IML48C From 45097570079a6b1c7761ad5706adc7c1e92e4183 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Nov 2011 17:45:13 -0800 Subject: [PATCH 300/349] IML52 --- 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 00f98622..25bb2a90 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=IML48C +export BUILD_ID=IML52 From 8f83247ceb2471e4faf810fc085fe523d15a8611 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 21 Nov 2011 19:29:29 -0800 Subject: [PATCH 301/349] IML52B --- 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 25bb2a90..19346cce 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=IML52 +export BUILD_ID=IML52B From 2f3d9f53dcfc4770e5bb80502b20ce6a2bdef7da Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Nov 2011 11:58:43 -0800 Subject: [PATCH 302/349] IML53 --- 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 70bd2351..6335c6a0 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 := MR1 -# 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=IML53 From a96f6f55b8ebd1e14ca6aa0a93a7955730a94297 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 22 Nov 2011 12:02:47 -0800 Subject: [PATCH 303/349] IML52C --- 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 6335c6a0..6f63c5c7 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=IML53 +export BUILD_ID=IML52C From 2fc337b23687d1b5513f0e3ca87deaa59bc3d011 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 28 Nov 2011 12:25:45 -0800 Subject: [PATCH 304/349] IML59 --- 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 70bd2351..9ab95a01 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 := MR1 -# 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=IML59 From fad12ed7900291697b6c92eef2d0861b58f19ca6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Nov 2011 12:05:06 -0800 Subject: [PATCH 305/349] IML60 --- 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 70bd2351..8d9b1a5a 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 := MR1 -# 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=IML60 From 71a53c5328655baf7d0ea19ea91ceaf0f4907c52 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Nov 2011 15:28:27 -0800 Subject: [PATCH 306/349] IML60B --- 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 8d9b1a5a..922e3765 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=IML60 +export BUILD_ID=IML60B From b3e5a0ec1c79f209ded785bafbfc74262148bf82 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 29 Nov 2011 17:08:24 -0800 Subject: [PATCH 307/349] IML60C --- 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 922e3765..abafc8bf 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=IML60B +export BUILD_ID=IML60C From b1cb2404f58e0211f3d9ac069f111fc9030c3c38 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Nov 2011 06:48:37 -0800 Subject: [PATCH 308/349] IML61 --- 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 70bd2351..d727f874 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 := MR1 -# 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=IML61 From bf14d43c4d4fdca50bb71dd65c7cd0e5ff2c54a3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 30 Nov 2011 16:59:51 -0800 Subject: [PATCH 309/349] IML61B --- 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 d727f874..ac370837 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=IML61 +export BUILD_ID=IML61B From c8f87721ba305210374fe447ef6a7c84ebf2c424 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 Dec 2011 06:48:19 -0800 Subject: [PATCH 310/349] IML62 --- 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 70bd2351..48da7463 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 := MR1 -# 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=IML62 From f63cb4f0d05e8c1715b5d0a4baf77ef636aa3776 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 1 Dec 2011 16:47:38 -0800 Subject: [PATCH 311/349] IML62B --- 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 70bd2351..6083fd5a 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 := MR1 -# 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=IML62B From 16da7247aa5b659a720beb449883f308a8439d35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Dec 2011 10:27:28 -0800 Subject: [PATCH 312/349] IML63 --- 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 70bd2351..24e67dec 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 := MR1 -# 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=IML63 From 77da392937c9a8afb8141aeabd1366e273d2ccdd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Dec 2011 16:23:13 -0800 Subject: [PATCH 313/349] IML63B --- 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 70bd2351..5b80a81c 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 := MR1 -# 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=IML63B From 4844adf4a9432b606277e98762508f8a5ffeff4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 5 Dec 2011 20:38:05 -0800 Subject: [PATCH 314/349] IML66 --- 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 70bd2351..9d34db60 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 := MR1 -# 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=IML66 From 43e70ba73e63284605a6ef30d3f0a0e8371bb10c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Dec 2011 16:56:46 -0800 Subject: [PATCH 315/349] IML67 --- 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 70bd2351..367d2bf5 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 := MR1 -# 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=IML67 From dcd0084bfcf9a02963bcebec8e915acf0a96d427 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 7 Dec 2011 11:15:49 -0800 Subject: [PATCH 316/349] IML67B --- 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 367d2bf5..78d0c4de 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=IML67 +export BUILD_ID=IML67B From 91158c9b5ea304472fff2c617cdbffaabef9585f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Dec 2011 07:03:55 -0800 Subject: [PATCH 317/349] IML69 --- 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 70bd2351..6bd5d245 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 := MR1 -# 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=IML69 From fd9df82adfdfaeaf0e41f94eb568411583bcf713 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Dec 2011 11:30:49 -0800 Subject: [PATCH 318/349] IML69B --- 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 6bd5d245..94a461f0 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=IML69 +export BUILD_ID=IML69B From 3c1e3b648d47558b5161f170813919714f1e3f62 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 8 Dec 2011 17:37:41 -0800 Subject: [PATCH 319/349] IML69C --- 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 70bd2351..3bf19b7e 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 := MR1 -# 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=IML69C From 5df6892ebdedf038759195e88da9c501680365e1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 9 Dec 2011 06:59:51 -0800 Subject: [PATCH 320/349] IML70 --- 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 70bd2351..f7635ff1 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 := MR1 -# 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=IML70 From 7578d7e58c7bec8c945a0d90dfbb487faf1914b8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 9 Dec 2011 16:19:55 -0800 Subject: [PATCH 321/349] IML70B --- 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 70bd2351..b14b3708 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 := MR1 -# 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=IML70B From 00d48ec3e00ae369c56f417ca380f4f6c4dee2ff Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 10 Dec 2011 21:35:46 -0800 Subject: [PATCH 322/349] IML70C --- 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 b14b3708..9f940ff8 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=IML70B +export BUILD_ID=IML70C From 8590bd19ebebb35f7e9c8a70757bbf124f174f99 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 12 Dec 2011 22:11:29 -0800 Subject: [PATCH 323/349] IML73 --- 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 70bd2351..82239008 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 := MR1 -# 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=IML73 From 308b5299a6300ba599b64131c310d2f77bb01c35 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Dec 2011 16:06:06 -0800 Subject: [PATCH 324/349] IML74 --- 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 70bd2351..e24a444c 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 := MR1 -# 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=IML74 From 77b9cad198eecc719883b1ac4bf7c2ff55c18d0e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Dec 2011 17:36:34 -0800 Subject: [PATCH 325/349] IML74B --- 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 70bd2351..8a07e59d 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 := MR1 -# 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=IML74B From 531a546ebafd9ae4845bdb0704c558c82815d5f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Dec 2011 18:54:33 -0800 Subject: [PATCH 326/349] IML74C --- 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 8a07e59d..90a26969 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=IML74B +export BUILD_ID=IML74C From 2fc113de8a0cd216f96977b3b08d6cfa4f140c6c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 13 Dec 2011 20:00:27 -0800 Subject: [PATCH 327/349] IML74D --- 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 90a26969..dc319d86 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=IML74C +export BUILD_ID=IML74D From 0fb6a79220ece7df85540328436ae28c20824f46 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Dec 2011 15:44:48 -0800 Subject: [PATCH 328/349] IML74E --- 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 dc319d86..1f8c11b0 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=IML74D +export BUILD_ID=IML74E From 9b9360c421d89373fdef7f83f3f5ef69bb831f50 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Dec 2011 15:56:03 -0800 Subject: [PATCH 329/349] IML74F --- 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 1f8c11b0..3f361173 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=IML74E +export BUILD_ID=IML74F From 769631608c109743b9f14c05b4eb4d9dc60a3ab1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Dec 2011 19:28:43 -0800 Subject: [PATCH 330/349] IML74G --- 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 3f361173..6173c5ce 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=IML74F +export BUILD_ID=IML74G From f4d94af8704b92cb3bb30ee846dac95f4ef2f92b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 14 Dec 2011 22:16:29 -0800 Subject: [PATCH 331/349] IML75 --- 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 70bd2351..aad63261 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 := MR1 -# 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=IML75 From 61a6402f0807aeebcdbb809b8f66889686fdc976 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Dec 2011 20:18:19 -0800 Subject: [PATCH 332/349] IML74H --- 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 aad63261..faba520f 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=IML75 +export BUILD_ID=IML74H From b7ae1edc6b9c97c06bf2e6408fc876adfb36b594 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Dec 2011 20:50:23 -0800 Subject: [PATCH 333/349] IML74I --- 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 6173c5ce..6d80157f 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=IML74G +export BUILD_ID=IML74I From e9db408701b41ffad352f1ebcbc9b7a83f9e0401 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 15 Dec 2011 21:43:32 -0800 Subject: [PATCH 334/349] IML74J --- 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 6d80157f..fadbdd1b 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=IML74I +export BUILD_ID=IML74J From a9819e2ff1f2f007d84f166c52636d783106f304 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Dec 2011 00:15:10 -0800 Subject: [PATCH 335/349] IML74K --- 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 fadbdd1b..c21c1e30 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=IML74J +export BUILD_ID=IML74K From cc8efd02cccea70122fca338d9382243d483b8d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 16 Dec 2011 12:02:53 -0800 Subject: [PATCH 336/349] IML77 --- 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 70bd2351..2bea4ac1 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 := MR1 -# 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=IML77 From e521822eb278a53d6aff80b18940dbf6691446f7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 17 Dec 2011 17:30:21 -0800 Subject: [PATCH 337/349] IML77B --- 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 2bea4ac1..0c690962 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=IML77 +export BUILD_ID=IML77B From 457b7f38a584f157ebeea4414c05f3e546838f94 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 20 Dec 2011 17:29:41 -0800 Subject: [PATCH 338/349] IML81 --- 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 70bd2351..35d653b3 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 := MR1 -# 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=IML81 From ee0472e8a561df12f86863446c7738f71c37fca8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 4 Jan 2012 16:45:21 -0800 Subject: [PATCH 339/349] IMM04 --- 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 70bd2351..9bc0a471 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 := MR1 -# 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=IMM04 From 110ddac4a5f7ca440e2d1101d297d4c6ee771b6e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 6 Jan 2012 16:34:51 -0800 Subject: [PATCH 340/349] IMM06 --- 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 70bd2351..3c8a2141 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 := MR1 -# 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=IMM06 From 6add6c759ab3107c5b87eb0d4d9ec41b7d966252 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 11 Jan 2012 16:31:51 -0800 Subject: [PATCH 341/349] IMM11 --- 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 70bd2351..538aafd3 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 := MR1 -# 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=IMM11 From 604b5429baecfde4304bfe80cf607c60b7dd425e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 12 Jan 2012 14:04:09 -0800 Subject: [PATCH 342/349] IMM12 --- 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 70bd2351..1f5218de 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 := MR1 -# 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=IMM12 From 958ac1c5f86c336797bc24a25a414a5dc056eb66 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 13 Jan 2012 16:21:18 -0800 Subject: [PATCH 343/349] IMM13 --- 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 70bd2351..758de5d7 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 := MR1 -# 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=IMM13 From 0ce12ef01d57bb6c2a32386dccb50a563caa3557 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 18 Jan 2012 21:20:54 -0800 Subject: [PATCH 344/349] IMM18 --- 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 70bd2351..bcbe1f23 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 := MR1 -# 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=IMM18 From 94e1e3b9141f380a789988754753702a16cf5930 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 19 Jan 2012 16:31:16 -0800 Subject: [PATCH 345/349] IMM19 --- 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 70bd2351..f08648d8 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 := MR1 -# 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=IMM19 From 5cb3f9d271785d9adc457eaf584a7a89a6f017d5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 Jan 2012 16:15:22 -0800 Subject: [PATCH 346/349] IMM20 --- 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 70bd2351..135b2701 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 := MR1 -# 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=IMM20 From ec87a474017fcaeb4cbddfe58980f5a7e0c37005 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 20 Jan 2012 16:31:06 -0800 Subject: [PATCH 347/349] IMM20B --- 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 135b2701..e3c236dc 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=IMM20 +export BUILD_ID=IMM20B From a45eafea138adcd0e5afd9a2a83cde45efb0edf8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 23 Jan 2012 16:55:54 -0800 Subject: [PATCH 348/349] IMM20C --- 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 e3c236dc..54f0e87d 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=IMM20B +export BUILD_ID=IMM20C From bce3fae6a50af748749eb9524b84a0962cd65816 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 24 Jan 2012 13:35:44 -0800 Subject: [PATCH 349/349] IMM24 --- 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 70bd2351..4da74225 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 := MR1 -# 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=IMM24