commit 56791ebe2622ba223ddde214f9b1c3f495191921
author Ying Wang <wangying@google.com> Tue Jun 15 15:17:42 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 15 15:17:42 2010 -0700
tree 9aa9171e2b4e393998e8b004b5ef3e09e1584355
parent 9f431335ab377396713b8b386ad7539b2b28eff5
parent c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6

am c01cf7b9: resolved conflicts for merge of 2b8d2383 to gingerbread

Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp

* commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
  Add a tapas command.
  Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.

core/multi_prebuilt.mk

diff --git a/core/multi_prebuilt.mk b/core/multi_prebuilt.mk
index 738a88d..00f9128 100644
--- a/core/multi_prebuilt.mk
+++ b/core/multi_prebuilt.mk
@@ -56,6 +56,7 @@
     $(eval LOCAL_MODULE := $(basename $(notdir $(t)))) \
     $(eval LOCAL_SRC_FILES := $(t)) \
    ) \
+  $(eval ALL_PREBUILT += $(LOCAL_MODULE)) \
   $(if $(6), \
     $(eval LOCAL_BUILT_MODULE_STEM := $(6)) \
    , \

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 \