commit c55bb9ecc92d34e448adec76bc06abdcd3c35f0e
author Andreas Huber <andih@google.com> Thu Jun 24 09:08:43 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 24 09:08:43 2010 -0700
tree 8afe2ecfee471cfd971345cef0a72554de73dd87
parent 48de6ce732a797f5c61186a3e57bec535e37d873
parent f2bab487cc71a8a210ff98d21172d62edcaa6d2a

am f2bab487: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread

Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp

* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
  Remove now unnecessary property overrides to opt into stagefright.

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 \