commit 28c292daf8ef0e7922ecdb0765556c42d428ca92
author The Android Open Source Project <initial-contribution@android.com> Tue Jun 29 14:36:09 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 29 14:36:09 2010 -0700
tree 6c5eb460c7a373c42aa82e21ae7de38ec116c20a
parent 822fa972f8013927f5180086b83bc81d15ca82dd
parent 79a8c2e9def3c41ac6bb1dd13c2d6ac179b3ac2e

am 79a8c2e9: set up fast-forward from froyo-release to gingerbread

Merge commit '79a8c2e9def3c41ac6bb1dd13c2d6ac179b3ac2e' into gingerbread-plus-aosp

* commit '79a8c2e9def3c41ac6bb1dd13c2d6ac179b3ac2e': (150 commits)
  frf85B
  frf85
  frf84B
  frf84
  frf83
  frf82
  FRF78
  FRF77B
  FRF75
  FRF72
  FRF71
  FRF69C
  FRF69B
  FRF69
  FRF68
  FRF64
  FRF58
  FRF57
  FRF55
  FRF51
  ...

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 \