commit 5cd0870e6215ab8c2be01a8e7b36600db323b77a
author David 'Digit' Turner <digit@google.com> Fri Jun 25 10:45:00 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 25 10:45:00 2010 -0700
tree f48632200d96cf3f1d49dfc48303827d144d87b7
parent fd76f16a0245d252ea949d245cc6cdff310291c9
parent a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3

am a7f9179e: Merge "Enable shared libraries to use crtbegin_so.S and crtend_so.S" into gingerbread

Merge commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3' into gingerbread-plus-aosp

* commit 'a7f9179ecc7e2c4b70cf6eedb8ea785a00efb4c3':
  Enable shared libraries to use crtbegin_so.S and crtend_so.S

core/build_id.mk

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

target/product/generic_x86.mk

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 \