commit b2fe30f05ee9f4ca27a0039a44e3fb3a64c0fc88
author Ying Wang <wangying@google.com> Thu Jun 24 18:02:17 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 24 18:02:17 2010 -0700
tree 20b3604217c4a478cce2ec2b3ef2a0d97b0e3fcd
parent 8969167db684ebdbfe72dd57aea7f7bdd5de8064
parent c955834ad0715343a2245142be416f92b83e8306

am c955834a: am c048c9b5: default empty tapas to TARGET_BUILD_APPS "all"

Merge commit 'c955834ad0715343a2245142be416f92b83e8306' into gingerbread-plus-aosp

* commit 'c955834ad0715343a2245142be416f92b83e8306':
  default empty tapas to TARGET_BUILD_APPS "all"

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 \