commit 7b4c42fe2be5c8c3b44f36297743b59396ff25ad
author Jeff Hamilton <jham@android.com> Wed Nov 18 13:31:12 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 18 13:31:12 2009 -0800
tree d69ca109339a278903b1bef87e4470fcd69b1a56
parent 1a0b304faca9a1977f1fe1b44d089a4b01593c81
parent f1cecce82f98d96e564cc44dd01c50909f2d7818

am f1cecce8: Merge change I4414f233 into eclair-mr2

Merge commit 'f1cecce82f98d96e564cc44dd01c50909f2d7818' into eclair-mr2-plus-aosp

* commit 'f1cecce82f98d96e564cc44dd01c50909f2d7818':
  Remove references to com.google.android.gtalkservice.xml.

target/product/generic_with_google.mk

diff --git a/target/product/generic_with_google.mk b/target/product/generic_with_google.mk
index ba30f15..e69303d 100644
--- a/target/product/generic_with_google.mk
+++ b/target/product/generic_with_google.mk
@@ -13,8 +13,7 @@
 
 PRODUCT_COPY_FILES := \
     vendor/google/frameworks/maps/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \
-    vendor/google/frameworks/datamessaging/com.google.android.datamessaging.xml:system/etc/permissions/com.google.android.datamessaging.xml \
-    vendor/google/apps/GTalkService/com.google.android.gtalkservice.xml:system/etc/permissions/com.google.android.gtalkservice.xml
+    vendor/google/frameworks/datamessaging/com.google.android.datamessaging.xml:system/etc/permissions/com.google.android.datamessaging.xml
 
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/generic.mk)