commit 822fa972f8013927f5180086b83bc81d15ca82dd
author Ying Wang <wangying@google.com> Tue Jun 29 09:31:06 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 29 09:31:06 2010 -0700
tree 6c5eb460c7a373c42aa82e21ae7de38ec116c20a
parent 5cd0870e6215ab8c2be01a8e7b36600db323b77a
parent dd2c21550c6a31493b4c1d0a01451a88a8747b35

am dd2c2155: am 0af605f3: Merge "Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS" into froyo

Merge commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35' into gingerbread-plus-aosp

* commit 'dd2c21550c6a31493b4c1d0a01451a88a8747b35':
  Allow to override --version-code and --version-name in LOCAL_AAPT_FLAGS

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 \