From 89b49883f717af8b0ddfa80b55d8d50fd8a680e2 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Thu, 11 Aug 2011 14:33:43 -0700 Subject: [PATCH 1/6] HLK42 --- 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..2d0b856e4 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=HLK42 From d6535a06280a290f27c676397e7915d5843412d9 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 17 Aug 2011 11:42:41 -0700 Subject: [PATCH 2/6] HLK42B --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2d0b856e4..40ac421ed 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=HLK42 +export BUILD_ID=HLK42B From a436a66b9c844dc0be074a41b7e1d311cb8b11fe Mon Sep 17 00:00:00 2001 From: Wink Saville Date: Wed, 17 Aug 2011 10:03:51 -0700 Subject: [PATCH 3/6] DO NOT MERGE: Update hc-LTE PLATFORM_VERSION from 3.2 to 3.2.2. Change-Id: Ib30bf10669119b588c691e4cebdc8093f402e3e4 --- core/version_defaults.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/version_defaults.mk b/core/version_defaults.mk index b54128c8d..ef85f843e 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 3.2 + PLATFORM_VERSION := 3.2.2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" From f8c2fc371d6cb30ed0310419e8128fd9fb0a037e Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 30 Aug 2011 11:07:24 -0700 Subject: [PATCH 4/6] HLK42C --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 40ac421ed..214279d41 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=HLK42B +export BUILD_ID=HLK42C From e7c91d57907dd7399c4e384ff033f011cf9b3bf4 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Fri, 2 Sep 2011 09:28:28 -0700 Subject: [PATCH 5/6] HLK42D --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 214279d41..2daa345df 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=HLK42C +export BUILD_ID=HLK42D From 94778ac58cc455498d32cc67694305817e43bbdb Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Tue, 6 Sep 2011 14:13:39 -0700 Subject: [PATCH 6/6] HLK42E --- core/build_id.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build_id.mk b/core/build_id.mk index 2daa345df..a9067348c 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=HLK42D +export BUILD_ID=HLK42E