From a1b904a3492f5de684eca77569c1338626f79825 Mon Sep 17 00:00:00 2001 From: The Android Automerger Date: Wed, 10 Apr 2013 19:07:13 -0700 Subject: [PATCH 1/2] 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 2/2] "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