From 68ae27a5bf49ab801715fa43d81fcc1bca3008cc Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 20 Feb 2013 15:53:41 -0800 Subject: [PATCH 01/48] 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 02/48] 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 03/48] 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 04/48] 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 05/48] 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 06/48] 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 07/48] 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 08/48] 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 09/48] 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 10/48] 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 11/48] 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 12/48] 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 13/48] 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 14/48] 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 15/48] 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 16/48] 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 17/48] 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 18/48] 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 19/48] 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 20/48] 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 21/48] 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 22/48] 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 23/48] 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 24/48] 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 25/48] 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 26/48] 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 27/48] 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 28/48] 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 29/48] 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 30/48] 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 31/48] 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 32/48] 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 33/48] 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 34/48] 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 35/48] 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 36/48] 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 37/48] 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 38/48] 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 39/48] 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 40/48] 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 41/48] 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 42/48] 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 43/48] 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 44/48] 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 45/48] 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 46/48] 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 47/48] 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 48/48] 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