commit 8969167db684ebdbfe72dd57aea7f7bdd5de8064
author Andy McFadden <fadden@android.com> Thu Jun 24 13:29:15 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 24 13:29:15 2010 -0700
tree 88e7688492bec5540dc9677fe53a80046e84c0ca
parent 6f2bb44b4b3551738c429a25f99e42aca8913f4f
parent bd960940e1299d69a6cdf4176cfd1f53a5dba83a

am bd960940: Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

Merge commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a' into gingerbread-plus-aosp

* commit 'bd960940e1299d69a6cdf4176cfd1f53a5dba83a':
  Ignore STAY_OFF_MY_LAWN when setting JAVA_HOME.

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 \