resolved conflicts for merge of 6dd2ae02 to eclair

[android-x86/build.git] / core / build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 060c9b5..40bb35d 100644 (file)
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -23,7 +23,7 @@
 # (like "TC1-RC5").  It must be a single word, and is
 # capitalized by convention.
 #
-BUILD_ID := Donut
+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