From 68ae27a5bf49ab801715fa43d81fcc1bca3008cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Feb 2013 15:53:41 -0800 Subject: [PATCH 001/190] JWQ51B --- 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 6ee3fe612..287407bed 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=JWQ51 +export BUILD_ID=JWQ51B From 30f504e86bf0ab5d405baa964fb44488398d08d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Feb 2013 17:35:30 -0800 Subject: [PATCH 002/190] JWQ51C --- 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 287407bed..33077609c 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=JWQ51B +export BUILD_ID=JWQ51C From 7d3e010a40cfcb1ee0e5f20f51af11576ba509ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Feb 2013 05:58:16 -0800 Subject: [PATCH 003/190] JWQ52 --- 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 40bb35dd3..9ace74c9e 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=JWQ52 From a7d360c73d53b06de17f8a6993204b4625a3b6e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Feb 2013 13:53:39 -0800 Subject: [PATCH 004/190] JWQ52B --- 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 9ace74c9e..f4fbc9cdd 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=JWQ52 +export BUILD_ID=JWQ52B From 650a2da0a871d484d3778ba4e67256de4e2d7e9b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Feb 2013 21:09:46 -0800 Subject: [PATCH 005/190] JWQ52C --- 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 f4fbc9cdd..d407e187a 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=JWQ52B +export BUILD_ID=JWQ52C From 44ca831c9c58895d0ba66ce15f023050d168d9c0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Feb 2013 17:32:33 -0800 Subject: [PATCH 006/190] JWQ52D --- 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 d407e187a..f9a3f3c01 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=JWQ52C +export BUILD_ID=JWQ52D From 1823c52a266ccfa600860ff88466d2910de3dc24 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Feb 2013 05:57:28 -0800 Subject: [PATCH 007/190] JWQ56 --- 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 40bb35dd3..1426caad6 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=JWQ56 From d6d2f7c04cb9dd35470c75f8ac3d83abbe06d7ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Feb 2013 06:50:20 -0800 Subject: [PATCH 008/190] JWQ56B --- 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 40bb35dd3..66f1f7ff5 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=JWQ56B From 4472b010fa3a5e21591a1b4358542d937a514fdf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Feb 2013 16:50:46 -0800 Subject: [PATCH 009/190] JWQ56C --- 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 66f1f7ff5..e5ee7c6ad 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=JWQ56B +export BUILD_ID=JWQ56C From 04291e4487eb137a1b1d9d1b676365ed473ac5ce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Feb 2013 08:51:46 -0800 Subject: [PATCH 010/190] JWQ57 --- 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 40bb35dd3..6ebe3ed3b 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=JWQ57 From ab67891bb29e07ab47b0f7145a996982a5d1508a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Feb 2013 05:56:32 -0800 Subject: [PATCH 011/190] JWQ58 --- 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 40bb35dd3..7b06de190 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=JWQ58 From 11a62ab62b89624c2ebed61802c9d903f59a8e72 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Feb 2013 05:56:56 -0800 Subject: [PATCH 012/190] JWQ59 --- 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 40bb35dd3..18a336f7e 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=JWQ59 From 232edaa4617c67aa2bd8eb374897aabf17d16fb1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Feb 2013 15:26:56 -0800 Subject: [PATCH 013/190] JWQ59B --- 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 18a336f7e..d0f3eba00 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=JWQ59 +export BUILD_ID=JWQ59B From 4cca3b597ed364dbdc0ec2a137ba8a8c35a9d834 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Mar 2013 11:33:21 -0800 Subject: [PATCH 014/190] JWQ59C --- 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 d0f3eba00..f2a61e6fa 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=JWQ59B +export BUILD_ID=JWQ59C From ef11e5f3e39ea7fa63bb92eb33fc5bf4834ab5d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 1 Mar 2013 16:14:42 -0800 Subject: [PATCH 015/190] JWQ59D --- 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 f2a61e6fa..577a0602f 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=JWQ59C +export BUILD_ID=JWQ59D From 349a24991312310f2173963cb814f588585e5127 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 4 Mar 2013 05:57:17 -0800 Subject: [PATCH 016/190] JWQ63 --- 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 40bb35dd3..928651d20 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=JWQ63 From 9b3a95ea52e65da33cd697d3013f774385a9cb4a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Mar 2013 05:56:56 -0800 Subject: [PATCH 017/190] JWQ64 --- 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 40bb35dd3..163e4c8d1 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=JWQ64 From b4b633051680a6d0e176fec7a16c1e5faacb5324 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 5 Mar 2013 16:36:01 -0800 Subject: [PATCH 018/190] JWQ64B --- 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 163e4c8d1..0db94df24 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=JWQ64 +export BUILD_ID=JWQ64B From 79cef110750be92ac80ce2daac266567cc4775dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Mar 2013 05:58:25 -0800 Subject: [PATCH 019/190] JWQ65 --- 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 40bb35dd3..73a60548f 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=JWQ65 From e45b77b0f250260edfc2f17210a44c2d1ba248eb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 6 Mar 2013 15:15:23 -0800 Subject: [PATCH 020/190] JWQ65B --- 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 73a60548f..12020937b 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=JWQ65 +export BUILD_ID=JWQ65B From 196a4a2936f59aa07fd2e5ac9e8a51b09b5006c2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Mar 2013 05:56:49 -0800 Subject: [PATCH 021/190] JWQ66 --- 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 40bb35dd3..ba36395fc 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=JWQ66 From e3f8d243d4e9ce03a001de580a542ae421513fe3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Mar 2013 13:56:07 -0800 Subject: [PATCH 022/190] JWQ66B --- 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 ba36395fc..f0c50a90d 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=JWQ66 +export BUILD_ID=JWQ66B From 534ad32d5ab9ea4655de85c75aeac594fd032edf Mon Sep 17 00:00:00 2001 From: Justin Ho Date: Thu, 7 Mar 2013 12:27:44 -0800 Subject: [PATCH 023/190] Add fr_CA to l10n builds Bug: 7579865 Change-Id: I92c1368b97ced96cacc560d829707b9b7de69ef4 --- target/product/languages_full.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/product/languages_full.mk b/target/product/languages_full.mk index 0fc13c77d..9f6c9ca5e 100644 --- a/target/product/languages_full.mk +++ b/target/product/languages_full.mk @@ -21,4 +21,4 @@ # These are all the locales that have translations and are displayable # by TextView in this branch. -PRODUCT_LOCALES := en_US fr_FR it_IT es_ES de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET hi_IN en_XA ar_XB +PRODUCT_LOCALES := en_US fr_FR it_IT es_ES de_DE nl_NL cs_CZ pl_PL ja_JP zh_TW zh_CN ru_RU ko_KR nb_NO es_US da_DK el_GR tr_TR pt_PT pt_BR rm_CH sv_SE bg_BG ca_ES en_GB fi_FI hi_IN hr_HR hu_HU in_ID iw_IL lt_LT lv_LV ro_RO sk_SK sl_SI sr_RS uk_UA vi_VN tl_PH ar_EG fa_IR th_TH sw_TZ ms_MY af_ZA zu_ZA am_ET hi_IN en_XA ar_XB fr_CA From 079a1028096a398f41aac7808becfaaaee2077a9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Mar 2013 18:35:42 -0800 Subject: [PATCH 024/190] JWQ66C --- 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 f0c50a90d..640cb7405 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=JWQ66B +export BUILD_ID=JWQ66C From fa9746ce7e30a2840f36825fe1b1d2fded4acc4d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 7 Mar 2013 18:47:33 -0800 Subject: [PATCH 025/190] JWQ66D --- 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 640cb7405..23a3a44eb 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=JWQ66C +export BUILD_ID=JWQ66D From 9597f7440c25b15e9a0bf1c930ff7b4f1218cbb5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 8 Mar 2013 11:28:21 -0800 Subject: [PATCH 026/190] JWQ66E --- 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 23a3a44eb..fd72f1731 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=JWQ66D +export BUILD_ID=JWQ66E From 800750ec6d75fb899a48e95363d5b01dd3850b11 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Mar 2013 05:58:51 -0700 Subject: [PATCH 027/190] JWQ70 --- 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 40bb35dd3..0129cff2f 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=JWQ70 From 13cde96a712ed447f2362173c356e30ec4259f46 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Mar 2013 12:05:10 -0700 Subject: [PATCH 028/190] JWQ70B --- 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 0129cff2f..63177dc11 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=JWQ70 +export BUILD_ID=JWQ70B From 6a27f431669bec37759220a368d5b49846fbf6f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 11 Mar 2013 15:50:48 -0700 Subject: [PATCH 029/190] JWQ70C --- 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 63177dc11..6c4d102a7 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=JWQ70B +export BUILD_ID=JWQ70C From 5018ef2f1dd9cb4a1f04e48cf94e1d2fb86f8e99 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Mar 2013 05:58:43 -0700 Subject: [PATCH 030/190] JWQ71 --- 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 40bb35dd3..01e098799 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=JWQ71 From 9625f16eae22a8e24c9f5920a26b7a96f34d704f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 12 Mar 2013 15:20:23 -0700 Subject: [PATCH 031/190] JWQ71B --- 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 01e098799..5aac82571 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=JWQ71 +export BUILD_ID=JWQ71B From bc92c0ffeb8fbee8b788fae172e89668d92c1369 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Mar 2013 05:56:57 -0700 Subject: [PATCH 032/190] JWQ72 --- 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 40bb35dd3..64c4f5e74 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=JWQ72 From 19dd77c2b45e9f92df94bda269376674b03086dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 13 Mar 2013 15:46:48 -0700 Subject: [PATCH 033/190] JWQ72B --- 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 64c4f5e74..52eb18759 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=JWQ72 +export BUILD_ID=JWQ72B From 056e58abd5d9a37559d5c8f85a0c285dc0d29187 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Mar 2013 05:57:18 -0700 Subject: [PATCH 034/190] JWQ73 --- 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 40bb35dd3..7fe80a7a8 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=JWQ73 From 164e483fd7c8ec64988a898641c7afe68ae1bfcd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 14 Mar 2013 15:09:10 -0700 Subject: [PATCH 035/190] JWQ73B --- 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 7fe80a7a8..29ec1e785 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=JWQ73 +export BUILD_ID=JWQ73B From bd73daca63a2a0b893c5c8e7193b7bbcf27cbed9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 15 Mar 2013 12:58:19 -0700 Subject: [PATCH 036/190] JWQ73C --- 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 29ec1e785..da315ac8e 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=JWQ73B +export BUILD_ID=JWQ73C From 44f38bf6ec4b1fc667a12a06bfa478cc28cfc64a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Mar 2013 05:58:12 -0700 Subject: [PATCH 037/190] JWQ77 --- 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 40bb35dd3..d0422e250 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=JWQ77 From 1be8428490098dc26fc47fdd65ccbc7dd476830b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 18 Mar 2013 18:27:55 -0700 Subject: [PATCH 038/190] JWQ77B --- 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 d0422e250..f02222866 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=JWQ77 +export BUILD_ID=JWQ77B From 1935014378b7f4deae727c3cd74e5ef81f89c795 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Mar 2013 05:56:36 -0700 Subject: [PATCH 039/190] JWQ78 --- 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 40bb35dd3..20665d0b1 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=JWQ78 From e0fdbf187839c9b2ef606f1c3d6c33f125e3fda4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 19 Mar 2013 16:53:50 -0700 Subject: [PATCH 040/190] JWQ78B --- 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 20665d0b1..8bbcc8eea 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=JWQ78 +export BUILD_ID=JWQ78B From 9b8ce9c7d8ba487c25c9275f7b447d8d5c34e6c8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Mar 2013 05:57:16 -0700 Subject: [PATCH 041/190] JWQ79 --- 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 40bb35dd3..c9df674b9 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=JWQ79 From 3cf2cf02aa5a20fd7ae5c0c2d5a17b0c6524d4c4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Mar 2013 14:37:24 -0700 Subject: [PATCH 042/190] JWQ79B --- 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 c9df674b9..8be6eaea5 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=JWQ79 +export BUILD_ID=JWQ79B From 4a131b8d14d2c9760a054da96c1f46fedb45b9a8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Mar 2013 05:57:05 -0700 Subject: [PATCH 043/190] JWQ80 --- 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 40bb35dd3..0af8041a8 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=JWQ80 From 0456082c6b04499c2f0a553f31d56a4677177e12 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 21 Mar 2013 16:08:14 -0700 Subject: [PATCH 044/190] JWQ80B --- 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 0af8041a8..de9c3c0bd 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=JWQ80 +export BUILD_ID=JWQ80B From f2c6ad66bfe34b5c46686ae431987ffc2218df05 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 22 Mar 2013 10:08:06 -0700 Subject: [PATCH 045/190] JWQ80C --- 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 de9c3c0bd..61cca060c 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=JWQ80B +export BUILD_ID=JWQ80C From 9213a5ffcc86b624eb6cf4653564ab7006a5ee41 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Mar 2013 05:58:11 -0700 Subject: [PATCH 046/190] JWQ84 --- 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 40bb35dd3..e0a207146 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=JWQ84 From 9ea3ce11ba3ba1974bf126331719a8924c4a0b5d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 25 Mar 2013 15:35:00 -0700 Subject: [PATCH 047/190] JWQ84B --- 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 e0a207146..51cd89cb9 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=JWQ84 +export BUILD_ID=JWQ84B From 1e71487b2d5ef2a2bca8dd3d8240ab90eb664699 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 26 Mar 2013 05:57:37 -0700 Subject: [PATCH 048/190] JWQ85 --- 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 40bb35dd3..92db14035 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=JWQ85 From 1495b1377175ade0729230c2326607a01cb00d36 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Mar 2013 05:57:57 -0700 Subject: [PATCH 049/190] JWQ86 --- 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 40bb35dd3..4ea7b232c 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=JWQ86 From 476c4c4b9776a2d3f341d523faeb6b65759341cf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Mar 2013 16:10:32 -0700 Subject: [PATCH 050/190] JWQ86B --- 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 4ea7b232c..d3260a308 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=JWQ86 +export BUILD_ID=JWQ86B From 68f6cc9d0f64c6f26bd52cf5859ce9a274c07762 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 27 Mar 2013 16:22:58 -0700 Subject: [PATCH 051/190] JWQ86C --- 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 d3260a308..3f0345b10 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=JWQ86B +export BUILD_ID=JWQ86C From 29869913e2d40fb25be77a03c265b16c3656f6c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Mar 2013 05:57:57 -0700 Subject: [PATCH 052/190] JWQ87 --- 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 40bb35dd3..be81c1ee2 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=JWQ87 From 2b94d4ee0a468211358dfe5224186085137c6972 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Mar 2013 15:46:28 -0700 Subject: [PATCH 053/190] JWQ87B --- 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 be81c1ee2..4646841dd 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=JWQ87 +export BUILD_ID=JWQ87B From bb999c493b3b2b23b9820363a2e39e0a852ac24b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 28 Mar 2013 17:28:35 -0700 Subject: [PATCH 054/190] JWQ87C --- 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 4646841dd..60542bc6a 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=JWQ87B +export BUILD_ID=JWQ87C From 387e52240d48895382cc24f34de85450dfdb8e52 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Mar 2013 14:03:26 -0700 Subject: [PATCH 055/190] JWQ87D --- 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 60542bc6a..4a46db877 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=JWQ87C +export BUILD_ID=JWQ87D From 6221e8a202ee1eb456653a6ec192db7b4c1238a4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 29 Mar 2013 16:18:48 -0700 Subject: [PATCH 056/190] JWQ87E --- 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 4a46db877..38a51844c 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=JWQ87D +export BUILD_ID=JWQ87E From e75ce2635f3b809f3e7e5055672e09497c936afb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Apr 2013 05:57:34 -0700 Subject: [PATCH 057/190] JWR01 --- 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 40bb35dd3..79d4ab10d 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=JWR01 From 6f59ed855173f1b383fe5b610e5c7744a696f53f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Apr 2013 16:29:47 -0700 Subject: [PATCH 058/190] JWR01B --- 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 79d4ab10d..8c500f261 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=JWR01 +export BUILD_ID=JWR01B From 577e5180258a3e857665f549f64154b6d455e4ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Apr 2013 09:19:59 -0700 Subject: [PATCH 059/190] "JWR02" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..261d848b1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR02 From 4981e545c63133fb5044a1edfe114c3da8f2f9ba Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Apr 2013 16:55:26 -0700 Subject: [PATCH 060/190] JWR02B --- 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 261d848b1..31f92fe00 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR02 +export BUILD_ID=JWR02B From 8d47f1f81b7ff49e96b712fb46d2873d12576438 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Apr 2013 06:03:57 -0700 Subject: [PATCH 061/190] "JWR03" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..a54155c4b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR03 From 0860d95d2de43045fc26aafd274800b16bf735a3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 3 Apr 2013 17:02:56 -0700 Subject: [PATCH 062/190] JWR03B --- 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 a54155c4b..73150b1d7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR03 +export BUILD_ID=JWR03B From cfddab2d5c5cf393ed9db6d4af4e75feaed1bfa1 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Apr 2013 05:57:18 -0700 Subject: [PATCH 063/190] "JWR04" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..35cbe1b44 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR04 From 05cd2f8ff4c5041cc9cfa0c1911b4b57ef75938f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 4 Apr 2013 16:25:30 -0700 Subject: [PATCH 064/190] JWR04B --- 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 35cbe1b44..324f9ad60 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR04 +export BUILD_ID=JWR04B From 34145be850e88d193cdbf9fee52563b37c62ca50 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 5 Apr 2013 15:14:45 -0700 Subject: [PATCH 065/190] JWR04C --- 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 324f9ad60..1e000407f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR04B +export BUILD_ID=JWR04C From 8db145f199a827df455bad7acfa380b0da8abb04 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Apr 2013 05:58:37 -0700 Subject: [PATCH 066/190] "JWR08" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..e4b9b1ff8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR08 From eacd415f5e04ed82dc74cfcc4532aa82328343c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Apr 2013 18:53:50 -0700 Subject: [PATCH 067/190] JWR08B --- 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 e4b9b1ff8..ffe86d03a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR08 +export BUILD_ID=JWR08B From ce3759433723ab44980a2e2b0434521be1ec19c6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Apr 2013 05:57:13 -0700 Subject: [PATCH 068/190] "JWR09" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..1a5c970ff 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR09 From b36d3033d0f077770d04ed2632ac6ad8c1c65ed6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Apr 2013 10:05:04 -0700 Subject: [PATCH 069/190] JWR09B --- 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 1a5c970ff..c14a16cd3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR09 +export BUILD_ID=JWR09B From bd1b6ab4c2b09cf381de128898cf4a394a156d48 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Apr 2013 16:00:25 -0700 Subject: [PATCH 070/190] JWR09C --- 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 c14a16cd3..03ba5e5d1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR09B +export BUILD_ID=JWR09C From 604ffe96de24a72edf8bd50a9c630b05d6c81b4f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Apr 2013 05:57:46 -0700 Subject: [PATCH 071/190] "JWR10" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..f00e9788f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR10 From f1a7e1393e5eb8c8cb7c3d9a538b8e2bb7b162d7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Apr 2013 12:18:38 -0700 Subject: [PATCH 072/190] JWR10B --- 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 f00e9788f..f13e7da92 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR10 +export BUILD_ID=JWR10B From a1b904a3492f5de684eca77569c1338626f79825 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Apr 2013 19:07:13 -0700 Subject: [PATCH 073/190] JWR10C --- 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 f13e7da92..40608c0cc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR10B +export BUILD_ID=JWR10C From 3099d895c955bb25f1c3345afaa71df18f3ea3db Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Apr 2013 05:57:18 -0700 Subject: [PATCH 074/190] "JWR11" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..036081f05 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR11 From e31a2fdfc0c337a66285d43c9faf7a6f65eeae96 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Apr 2013 14:44:38 -0700 Subject: [PATCH 075/190] JWR11B --- 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 036081f05..31fc27029 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR11 +export BUILD_ID=JWR11B From 3ebe68c8997d331198425229f118a192c6c2311a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Apr 2013 23:22:16 -0700 Subject: [PATCH 076/190] "JWR11C" --- 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 31fc27029..0d66a5b72 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR11B +export BUILD_ID=JWR11C From b70ec9e1e5de060a162fc4175680fb6bdb1b4ee4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Apr 2013 11:30:53 -0700 Subject: [PATCH 077/190] JWR11D --- 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 0d66a5b72..7406191dc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR11C +export BUILD_ID=JWR11D From cfe9beb6cb2be763f86a35afef9cac9d92ef7d3b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Apr 2013 14:32:07 -0700 Subject: [PATCH 078/190] JWR11E --- 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 7406191dc..c3bf00fce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR11D +export BUILD_ID=JWR11E From f17a20322b131f745ef0b7d854c7fe2d94bfbf6f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Apr 2013 16:20:46 -0700 Subject: [PATCH 079/190] JWR11F --- 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 c3bf00fce..80cdb7e5f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR11E +export BUILD_ID=JWR11F From 9ab7e9575b157efcf47900cb044e2729e172f452 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Apr 2013 18:15:42 -0700 Subject: [PATCH 080/190] JWR11G --- 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 80cdb7e5f..a9ad13256 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR11F +export BUILD_ID=JWR11G From 920ac0436a86d5bda1cbf7f739d0dc3d2b71944e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Apr 2013 05:57:31 -0700 Subject: [PATCH 081/190] "JWR15" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..e032147cd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR15 From 4c7ab87dc951039d4eb71997f3f45039b1c0c5dd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 15 Apr 2013 16:39:23 -0700 Subject: [PATCH 082/190] JWR15B --- 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 e032147cd..f6dd8edc8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR15 +export BUILD_ID=JWR15B From 9165c3f6955eeeda41f23a9c9539439c56c6cd77 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Apr 2013 05:56:35 -0700 Subject: [PATCH 083/190] "JWR16" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..7d3c0ff63 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR16 From 1709f39a72e4a1df0f94fc4b6df9eaab6744e0de Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 16 Apr 2013 15:17:49 -0700 Subject: [PATCH 084/190] JWR16B --- 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 7d3c0ff63..6623ff4e5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR16 +export BUILD_ID=JWR16B From edc92a0977f41c46d59b224106a2091e23289e15 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Apr 2013 05:56:52 -0700 Subject: [PATCH 085/190] "JWR17" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..3ca01af11 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR17 From fec4c43d3b608d684a3d4edc00b3767cb70c5293 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Apr 2013 15:00:34 -0700 Subject: [PATCH 086/190] JWR17B --- 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 3ca01af11..426064c03 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR17 +export BUILD_ID=JWR17B From 4279aa74b81b88c3a968c79e9330e37a942ff536 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 18 Apr 2013 05:56:59 -0700 Subject: [PATCH 087/190] "JWR18" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..d03ff2349 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR18 From e28954236a1e192d0129b97a44540969d1077285 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Apr 2013 09:56:15 -0700 Subject: [PATCH 088/190] JWR18B --- 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 d03ff2349..1b48d3b84 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR18 +export BUILD_ID=JWR18B From 7d2bda02d7899c0c7aa0fb8cdf27b3adb365a054 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 19 Apr 2013 12:12:09 -0700 Subject: [PATCH 089/190] JWR18C --- 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 1b48d3b84..1570680e8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR18B +export BUILD_ID=JWR18C From 099c8b35dd5dcbf61179d2b54a32a99975369b0c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Apr 2013 05:57:26 -0700 Subject: [PATCH 090/190] "JWR22" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..7bbdedba4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR22 From 6ef2890950d0106b80e4e921f0b949c123a773ee Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 22 Apr 2013 17:00:35 -0700 Subject: [PATCH 091/190] JWR22B --- 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 7bbdedba4..556848d54 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR22 +export BUILD_ID=JWR22B From 82927697393238c209833db47bd5a7db94550649 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Apr 2013 05:56:41 -0700 Subject: [PATCH 092/190] "JWR23" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..4f5c0dc35 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR23 From 5356786217c958113603182abb771805c64340b3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 23 Apr 2013 09:30:27 -0700 Subject: [PATCH 093/190] "JWR23B" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..9b7468ca1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR23B From d78ec2452f6a8b7e0364926922831c8f81eddbb2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Apr 2013 05:56:32 -0700 Subject: [PATCH 094/190] "JWR24" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..debb0f886 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR24 From e747e529ea56615348ce8e56f11dc982e4688b39 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 24 Apr 2013 16:14:50 -0700 Subject: [PATCH 095/190] JWR24B --- 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 debb0f886..006a9a172 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR24 +export BUILD_ID=JWR24B From 45e53447ddcb9b28672c543fe1fd6417958dd2ca Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Apr 2013 05:56:35 -0700 Subject: [PATCH 096/190] "JWR25" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..932122060 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR25 From ab9dfeb1e446387355dbc3ee276739be9abdd84a Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 25 Apr 2013 14:13:52 -0700 Subject: [PATCH 097/190] JWR25B --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 932122060..e85adcd79 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR25 +export BUILD_ID=JWR25B From f22c739daebf09d7a64e98f205e72977f29e2ac8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 26 Apr 2013 13:38:10 -0700 Subject: [PATCH 098/190] JWR25C --- 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 e85adcd79..375e30e49 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=JWR25B +export BUILD_ID=JWR25C From 94919054414cb1d197bd4c857c4dec54968e1b4e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Apr 2013 05:57:15 -0700 Subject: [PATCH 099/190] "JWR29" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..460845d08 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR29 From 0e9cb06273056166bfc28db2909bb6bc43de25b5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 29 Apr 2013 16:30:24 -0700 Subject: [PATCH 100/190] JWR29B --- 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 460845d08..c6de58db1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR29 +export BUILD_ID=JWR29B From 31c46b99f5f43deb30970076abe9a8a7223a0796 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Apr 2013 05:56:46 -0700 Subject: [PATCH 101/190] "JWR30" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..b65024506 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR30 From c147461597d683631732cdd45624e96fbe26a705 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 May 2013 05:56:49 -0700 Subject: [PATCH 102/190] "JWR31" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..3d9784647 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR31 From 6dc6996125b92599b90602adc4fe2a5e5a6a9e59 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 1 May 2013 16:47:45 -0700 Subject: [PATCH 103/190] JWR31B --- 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 3d9784647..ebd3192c0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR31 +export BUILD_ID=JWR31B From 231f096fcc624190945f8a8c0dc80a5c12eb5bb2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 May 2013 05:56:36 -0700 Subject: [PATCH 104/190] "JWR32" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40bb35dd3..5aadd0816 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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=JWR32 From c6e89b91e685636a420265d60f3ae49b24d26f42 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 2 May 2013 15:46:43 -0700 Subject: [PATCH 105/190] JWR32B --- 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 5aadd0816..4855148ee 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR32 +export BUILD_ID=JWR32B From 2bb14190e16e02a9df9cdb9bd4cad3b04631c4d2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 May 2013 13:03:10 -0700 Subject: [PATCH 106/190] JWR32C --- 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 4855148ee..ee961e32d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR32B +export BUILD_ID=JWR32C From 1474751231720eab7fae1f5b0e14f1991e0a6260 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 May 2013 15:51:21 -0700 Subject: [PATCH 107/190] JWR32D --- 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 ee961e32d..0c7d23f77 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR32C +export BUILD_ID=JWR32D From 5250761187d3b588b9f436c39e5f3f9d6f567dbe Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 3 May 2013 18:14:17 -0700 Subject: [PATCH 108/190] JWR32E --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 0c7d23f77..0b9f1dd33 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR32D +export BUILD_ID=JWR32E From 06947a8ba83c00ed5585a9a42e9c8112a120e644 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 May 2013 05:56:48 -0700 Subject: [PATCH 109/190] "JWR36" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..958192cfb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR36 From 02984c02865a296f512e0367f441780f839b83bf Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 May 2013 15:26:42 -0700 Subject: [PATCH 110/190] JWR36B --- 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 958192cfb..122c3f54f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR36 +export BUILD_ID=JWR36B From 9b6a02c86892e60be7ef6c0bcf71f402e58f7d2d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 6 May 2013 16:48:18 -0700 Subject: [PATCH 111/190] JWR36C --- 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 122c3f54f..b111b28db 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR36B +export BUILD_ID=JWR36C From 3c15bf480069c536e83ec8283ecbbaf7e36124d0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 7 May 2013 05:56:27 -0700 Subject: [PATCH 112/190] "JWR37" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..d0e332bc6 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR37 From e4520cce234ad5b8bb76fdb0fee60c69d53e4634 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 May 2013 05:56:37 -0700 Subject: [PATCH 113/190] "JWR38" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..b9751f4a5 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR38 From d82417df344aeedc5720909d2287768072d91580 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 8 May 2013 13:56:28 -0700 Subject: [PATCH 114/190] JWR38B --- 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 b9751f4a5..ad013ae0c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR38 +export BUILD_ID=JWR38B From f5e8dcdfbe7cae41219e4b858171b4d6c686dbbb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 May 2013 05:56:33 -0700 Subject: [PATCH 115/190] "JWR39" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..026a2a9e3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR39 From 6229565ee34f32dd50c36b15cb96b06fda352c2b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 May 2013 13:01:23 -0700 Subject: [PATCH 116/190] JWR39B --- 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 026a2a9e3..5b358509e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR39 +export BUILD_ID=JWR39B From 4350270ba0239833adf90bf03e2e0f4dafcd543e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 9 May 2013 16:02:50 -0700 Subject: [PATCH 117/190] JWR39C --- 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 5b358509e..147101f81 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR39B +export BUILD_ID=JWR39C From 5e59fa5a2f1c4996b557b3ef6d31041783548333 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 10 May 2013 12:09:32 -0700 Subject: [PATCH 118/190] JWR39D --- 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 147101f81..af6f6a1d0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR39C +export BUILD_ID=JWR39D From b84a270ce2f8664e61ce497524e87734aaaeebbb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 13 May 2013 05:57:01 -0700 Subject: [PATCH 119/190] "JWR43" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..71ee7cd1d 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR43 From 3226bb72762a77f1d00e8afbc79f8181474aac0b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 May 2013 05:56:30 -0700 Subject: [PATCH 120/190] "JWR44" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..cb3b417a1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR44 From 490f39dff1c00abbfb4cbd5bd51db9e55749ea12 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 14 May 2013 12:58:47 -0700 Subject: [PATCH 121/190] "JWR44B" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..e70866896 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR44B From ef95aa70877fa31ff0790dc89b89f86d36a7b520 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 May 2013 05:56:33 -0700 Subject: [PATCH 122/190] "JWR45" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..abfd00ac2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR45 From f91381bd25593e20efe8710da9917a63a702f346 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 15 May 2013 16:42:18 -0700 Subject: [PATCH 123/190] JWR45B --- 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 abfd00ac2..98353ae8f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR45 +export BUILD_ID=JWR45B From 0a8805716c14158c9171bc6b755a0e6c5a03c8f3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 May 2013 05:56:48 -0700 Subject: [PATCH 124/190] "JWR46" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..606564cb4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR46 From 3061af8a7eee5e06596f67ccab0f8e0722d01354 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 16 May 2013 15:21:01 -0700 Subject: [PATCH 125/190] JWR46B --- 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 606564cb4..b93fbe9de 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR46 +export BUILD_ID=JWR46B From 9f734d4ac4666587cbf238e8dcc9ff5e564407e5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 17 May 2013 13:50:50 -0700 Subject: [PATCH 126/190] JWR46C --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index b93fbe9de..f54546f77 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR46B +export BUILD_ID=JWR46C From 6290bbdae1cb79059ea0395cc55697c575816bad Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 19 May 2013 05:56:38 -0700 Subject: [PATCH 127/190] "JWR49" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..e485b6b33 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR49 From 277a46a5df77d5595a91d3a312a1a6d0195e6043 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 May 2013 05:55:38 -0700 Subject: [PATCH 128/190] "JWR50" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..4bc232167 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR50 From 69a1b28ac85db0152828353c1e5860756928e2d8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 20 May 2013 17:09:55 -0700 Subject: [PATCH 129/190] JWR50B --- 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 4bc232167..261f23a78 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR50 +export BUILD_ID=JWR50B From 94c03acdb5658636f47b1bdbfe699a5f4e01678c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 May 2013 07:47:57 -0700 Subject: [PATCH 130/190] "JWR51" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..3eac4e4df 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR51 From 45fc4139737340151b88d35dbda0dcf4a389604f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 21 May 2013 17:18:17 -0700 Subject: [PATCH 131/190] JWR51B --- 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 3eac4e4df..07c670b3e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR51 +export BUILD_ID=JWR51B From 73e32267c0edd3c7f3a892c5a36317f70139caa6 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 May 2013 05:56:16 -0700 Subject: [PATCH 132/190] "JWR52" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..ba0574753 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR52 From 6f0c4613886ade48d3f15e6ab2de018f6c7f5679 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 22 May 2013 19:10:49 -0700 Subject: [PATCH 133/190] JWR52B --- 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 ba0574753..fc3d5b325 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR52 +export BUILD_ID=JWR52B From 9eb9f2d0af972797c7679acbb12259d1c016de01 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 May 2013 05:56:28 -0700 Subject: [PATCH 134/190] "JWR53" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..c5d334f4b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR53 From 2803c67c4234907332deb36165e0e8efb47ea900 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 May 2013 14:35:29 -0700 Subject: [PATCH 135/190] JWR53B --- 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 c5d334f4b..34997fcde 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR53 +export BUILD_ID=JWR53B From e4f52fb70af85992c855fb6f0570b4b721b9cad5 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 May 2013 19:58:17 -0700 Subject: [PATCH 136/190] JWR53C --- 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 34997fcde..43aa415ce 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR53B +export BUILD_ID=JWR53C From e30590f90a7fcc96ad720bdaa75d90b0bd591216 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 23 May 2013 22:09:57 -0700 Subject: [PATCH 137/190] JWR53D --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 43aa415ce..45d7945e4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR53C +export BUILD_ID=JWR53D From 058ea7d941515dbbff570de81d585794036536f0 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 May 2013 12:23:06 -0700 Subject: [PATCH 138/190] JWR53E --- 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 45d7945e4..389b3c0d7 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=JWR53D +export BUILD_ID=JWR53E From 23b0797c031d00285ebe248be46efda1b832487e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 24 May 2013 15:21:35 -0700 Subject: [PATCH 139/190] JWR53F --- 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 389b3c0d7..5be90b19d 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=JWR53E +export BUILD_ID=JWR53F From 00f6b9bae5365649613f0575ab94e420268d7ac8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 26 May 2013 05:56:30 -0700 Subject: [PATCH 140/190] "JWR56" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..5fded4487 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR56 From ca175af8af681cd9abc9a922f63a0e1b769c1d3b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 27 May 2013 05:55:38 -0700 Subject: [PATCH 141/190] "JWR57" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..cdae1baeb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR57 From e796456cd4ba0885a5d043cc07105b2e3a9c5ae9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 May 2013 05:55:19 -0700 Subject: [PATCH 142/190] "JWR58" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..871c57bcd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR58 From 262d805451506993d2d89b6f016e23aeea2ea0ae Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 May 2013 16:11:03 -0700 Subject: [PATCH 143/190] JWR58B --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 871c57bcd..0ae315286 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR58 +export BUILD_ID=JWR58B From 293deacab2e5246e0d36e0fe01c36312fb43460f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 28 May 2013 18:15:01 -0700 Subject: [PATCH 144/190] JWR58C --- 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 0ae315286..6f308fd70 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=JWR58B +export BUILD_ID=JWR58C From 1e6107149f76bee3c4c327684927eea109fb45c2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 May 2013 05:56:24 -0700 Subject: [PATCH 145/190] "JWR59" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..96bae318c 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR59 From e8eaac4de2443153ce8f178766561567915e8624 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 May 2013 15:40:24 -0700 Subject: [PATCH 146/190] JWR59B --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 96bae318c..2500d68f0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR59 +export BUILD_ID=JWR59B From e8d58c41e39d3c7080ef0b150e0e5938ae450d92 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 29 May 2013 17:53:49 -0700 Subject: [PATCH 147/190] JWR59C --- 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 2500d68f0..c31cbe513 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=JWR59B +export BUILD_ID=JWR59C From 6f1fdccffad389d92e4d3d1e08da052127a9b58f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 May 2013 05:57:12 -0700 Subject: [PATCH 148/190] "JWR60" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..9d6d297be 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR60 From 12c23b706e1239882e2c150a51cc8d19910e70c4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 May 2013 14:36:32 -0700 Subject: [PATCH 149/190] JWR60B --- core/build_id.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 9d6d297be..3e2f1b140 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -1,3 +1,4 @@ + # # Copyright (C) 2008 The Android Open Source Project # @@ -18,4 +19,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JWR60 +export BUILD_ID=JWR60B From 57bb5d495067c24735e6701aab984db55809c9c9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 May 2013 15:26:43 -0700 Subject: [PATCH 150/190] JWR60C --- 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 3e2f1b140..0e21a608e 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=JWR60B +export BUILD_ID=JWR60C From 99ffbcf0f6b5092fec1a48c6dbb18db157634818 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 30 May 2013 19:02:55 -0700 Subject: [PATCH 151/190] JWR60D --- 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 0e21a608e..aa7c24371 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=JWR60C +export BUILD_ID=JWR60D From c41c56b4eb44376256800db693822888837bf062 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 31 May 2013 13:41:15 -0700 Subject: [PATCH 152/190] JWR60E --- 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 aa7c24371..d58810596 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=JWR60D +export BUILD_ID=JWR60E From b63470ae5bdfb2ab7865ebbfb022769bf3a79115 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 2 Jun 2013 05:56:48 -0700 Subject: [PATCH 153/190] "JWR63" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..b77f7b43b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR63 From 8c5d8a6f94049b653e4fd113b093592403776fa3 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 3 Jun 2013 05:55:38 -0700 Subject: [PATCH 154/190] "JWR64" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..37466031f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JWR64 From dccc4ba344719fbc9d13ef198bfc5ae88c992031 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 5 Jun 2013 11:17:07 -0700 Subject: [PATCH 155/190] "JSR66" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..447944590 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR66 From bdcb7fcde2200d05243dc1c3984df50dd7189531 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 6 Jun 2013 05:56:22 -0700 Subject: [PATCH 156/190] "JSR67" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..00badcd46 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR67 From 565af6a2602050fc3b32823f8b60c4f30a992b54 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 9 Jun 2013 05:56:51 -0700 Subject: [PATCH 157/190] "JSR70" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..f334692b8 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR70 From b2b3db347f9086fa4517262463edd4323cb57f12 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 10 Jun 2013 05:55:35 -0700 Subject: [PATCH 158/190] "JSR71" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..31c9420bb 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR71 From b6a48228f9738dd9c11f3584853e31caeedc45ab Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 11 Jun 2013 05:56:01 -0700 Subject: [PATCH 159/190] "JSR72" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..2d03c6b34 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR72 From fba3d4e98fac09a394c20cb66fb7d0232e8c5ead Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 12 Jun 2013 05:56:41 -0700 Subject: [PATCH 160/190] "JSR73" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..47cba099b 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR73 From d6ab7c62efd634f822233567e050fa091fa4b324 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 13 Jun 2013 05:56:10 -0700 Subject: [PATCH 161/190] "JSR74" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..115f88aa9 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR74 From 256d71560c83c6c222bb363b181c60c1fb083519 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 16 Jun 2013 05:56:42 -0700 Subject: [PATCH 162/190] "JSR77" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..2e5e86005 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR77 From d48861fdbb760de42c800d89318d686b9ac7f6ac Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 17 Jun 2013 05:55:31 -0700 Subject: [PATCH 163/190] "JSR78" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..e9930f648 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR78 From d41113f6ba6250c42b6c27995987213746f17a59 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 18 Jun 2013 11:32:52 -0700 Subject: [PATCH 164/190] "JSR78B" --- 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 e9930f648..6e79465ef 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSR78 +export BUILD_ID=JSR78B From 519720ddf06e8cbac86d3faabaeae129d6769cb8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 20 Jun 2013 11:22:47 -0700 Subject: [PATCH 165/190] JSR78C --- 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 6e79465ef..a20f35057 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSR78B +export BUILD_ID=JSR78C From 3b1ec028751da12b81532f21f5aeea6df7853943 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Jun 2013 11:37:27 -0700 Subject: [PATCH 166/190] "JSR82" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..a7675b0cf 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR82 From 5c59dc6798e52843b0c41ab4a8ae042fab2f4504 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 21 Jun 2013 15:39:44 -0700 Subject: [PATCH 167/190] JSR82B --- 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 a7675b0cf..7c2b54391 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSR82 +export BUILD_ID=JSR82B From 4027d0ebbd668921e1293e85c71ac69bc1653cce Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Jun 2013 14:44:20 -0700 Subject: [PATCH 168/190] JSR78D --- 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 a20f35057..a933c62df 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSR78C +export BUILD_ID=JSR78D From d829e5c4506901459478045ba5fb54348935e02d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 24 Jun 2013 14:55:38 -0700 Subject: [PATCH 169/190] "JSR85" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..47567877e 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR85 From 69fb023e6139525239144d0b5a58fbecad1006ef Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 26 Jun 2013 12:18:19 -0700 Subject: [PATCH 170/190] "JSR87" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..9f6ab6260 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR87 From 3963f3cbe0809153597ae15a502b0f821e99e719 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 27 Jun 2013 05:56:02 -0700 Subject: [PATCH 171/190] "JSR88" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..4abd7aec7 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR88 From bbb986b22da6faa53ee7413ab510994babb350d4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Jun 2013 05:25:50 -0700 Subject: [PATCH 172/190] JSR88B --- 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 4abd7aec7..69db23fd2 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSR88 +export BUILD_ID=JSR88B From 30d8a2474022453b569d9b0c56a251cd94b6943f Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 28 Jun 2013 14:57:23 -0700 Subject: [PATCH 173/190] JSR88C --- 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 69db23fd2..a2a98c764 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSR88B +export BUILD_ID=JSR88C From b97ce8cd15653e224dc9897a2b92fc3fb18b9f78 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sun, 30 Jun 2013 05:56:26 -0700 Subject: [PATCH 174/190] "JSR91" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..e284de98a 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSR91 From 6666776df225a4def2867feff03c4707a1774d77 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 1 Jul 2013 05:56:00 -0700 Subject: [PATCH 175/190] "JSS01" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..29a732fb1 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSS01 From a8c7c0f922865a2a5e3a35ba8a8f921c515bd2bd Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Jul 2013 05:56:01 -0700 Subject: [PATCH 176/190] "JSS02" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..464600aed 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSS02 From 0b001bdbb17ee6bd169ee2b1e3f11c2a4adf9f03 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 2 Jul 2013 11:57:14 -0700 Subject: [PATCH 177/190] JSS02B --- 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 464600aed..373123ce0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS02 +export BUILD_ID=JSS02B From 2145e71b107f88b85df6abd58d2e7b79eb781a61 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Mon, 8 Jul 2013 05:56:31 -0700 Subject: [PATCH 178/190] "JSS08" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..184249834 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSS08 From b955041d0e7b9fdb9c4f45559e04b1f4fe81b589 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Jul 2013 05:56:31 -0700 Subject: [PATCH 179/190] "JSS09" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..db7d3ffcd 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSS09 From 0104e31bdca0dc94e6020e3cb8922328573b9c0c Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 9 Jul 2013 16:38:30 -0700 Subject: [PATCH 180/190] "JSS09B" --- 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 db7d3ffcd..b646179c0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS09 +export BUILD_ID=JSS09B From 0e6cd798b8a7e3775670547b5ec9010d7c074071 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Jul 2013 05:56:05 -0700 Subject: [PATCH 181/190] "JSS10" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..6eec51e27 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSS10 From e17c7f4324a64fa260aaece10cb8565a659663c7 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jul 2013 05:56:15 -0700 Subject: [PATCH 182/190] "JSS11" --- core/build_id.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/core/build_id.mk b/core/build_id.mk index ffff91e7b..046f79fbc 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -13,20 +13,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 := JB_MR2 -# 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=JSS11 From 29b849f1969f7bd7e62379e440227db82110919e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jul 2013 17:12:16 -0700 Subject: [PATCH 183/190] "JSS11B" --- 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 046f79fbc..7642d5928 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11 +export BUILD_ID=JSS11B From 69a20402b6d21745d8c266d7cc63b32b0f7bb905 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jul 2013 18:41:43 -0700 Subject: [PATCH 184/190] JSS11C --- 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 7642d5928..a2ec46e57 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11B +export BUILD_ID=JSS11C From 4e9b763cf2ee10f83a798f3a0794bbd72b3826c8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Jul 2013 20:26:53 -0700 Subject: [PATCH 185/190] "JSS11D" --- 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 a2ec46e57..4cbc96ca3 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11C +export BUILD_ID=JSS11D From cce09abc6185cfb2e047e007f588bcec4e4096e8 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Jul 2013 10:53:23 -0700 Subject: [PATCH 186/190] "JSS11E" --- 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 4cbc96ca3..821960cc0 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11D +export BUILD_ID=JSS11E From 7712d0ca94f7ee2e205c9dfd496c40b58cc04b92 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Jul 2013 12:19:57 -0700 Subject: [PATCH 187/190] JSS11F --- 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 821960cc0..c70aff96f 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11E +export BUILD_ID=JSS11F From 1adb5ed7e985dded204ea2f1c00ecab7d8b7571b Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Jul 2013 17:10:48 -0700 Subject: [PATCH 188/190] "JSS11G" --- 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 c70aff96f..677a27051 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11F +export BUILD_ID=JSS11G From 11622182a20c15abba4ccda137af4cc3050ca81e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 12 Jul 2013 18:49:06 -0700 Subject: [PATCH 189/190] "JSS11H" --- 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 677a27051..c9c226289 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11G +export BUILD_ID=JSS11H From dff14e56cdcb4fcbad483e845920236131ea083d Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Sat, 13 Jul 2013 00:53:18 -0700 Subject: [PATCH 190/190] "JSS11I" --- 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 c9c226289..c82d97760 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=JSS11H +export BUILD_ID=JSS11I