commit 4873beb5b018d74a3b38403f34628ed6c3435888
author Guang Zhu <guangzhu@google.com> Wed Jun 16 15:26:41 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 16 15:26:41 2010 -0700
tree bfa2ed4802c8b38038832a64e15e8d27dead6a4d
parent 56791ebe2622ba223ddde214f9b1c3f495191921
parent a943634afaf64ad2188fc8ecfb54daed40350be2

am a943634a: Merge "improvement for emma filter option" into gingerbread

Merge commit 'a943634afaf64ad2188fc8ecfb54daed40350be2' into gingerbread-plus-aosp

* commit 'a943634afaf64ad2188fc8ecfb54daed40350be2':
  improvement for emma filter option

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 \