am 62c65665: am 81b68ad9: Merge "docs: show the download message on the SDK homepage because we no longer need to walk through the TOS" into froyo
Merge commit '62c65665589de463a557e3826dc6cb2e1ec99c2a' into gingerbread-plus-aosp
* commit '62c65665589de463a557e3826dc6cb2e1ec99c2a':
docs: show the download message on the SDK homepage because we no longer
diff --git a/core/build_id.mk b/core/build_id.mk
index 40bb35d..e954794 100644
--- 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 := MASTER
+BUILD_ID := OPENMASTER
# DISPLAY_BUILD_NUMBER should only be set for development branches,
# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk
index 9713900..345a79a 100644
--- a/target/product/generic_x86.mk
+++ b/target/product/generic_x86.mk
@@ -3,7 +3,7 @@
# you should derive from generic_with_google.mk
PRODUCT_PACKAGES := \
- AlarmClock \
+ DeskClock \
AlarmProvider \
Calendar \
Camera \