resolved conflicts for merge of 9bfa95cf to master

Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
This commit is contained in:
Jean-Baptiste Queru
2010-09-28 07:20:52 -07:00
3 changed files with 0 additions and 3 deletions

View File

@@ -55,7 +55,6 @@ PRODUCT_PACKAGES := \
sqlite-jdbc \
wpa_supplicant.conf \
Browser \
CarHomeLauncher \
Contacts \
Home \
HTMLViewer \

View File

@@ -21,7 +21,6 @@ PRODUCT_POLICY := android.policy_phone
PRODUCT_PACKAGES := \
AccountAndSyncSettings \
CarHome \
DeskClock \
AlarmProvider \
Bluetooth \

View File

@@ -22,7 +22,6 @@ PRODUCT_PACKAGES := \
AccountAndSyncSettings \
Camera \
Calculator \
CarHome \
DeskClock \
Development \
DrmProvider \