Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_vendor_cyanogen into gingerbread
diff --git a/products/cyanogen_crespo4g.mk b/products/cyanogen_crespo4g.mk
index aa48e3e..3edd46d 100644
--- a/products/cyanogen_crespo4g.mk
+++ b/products/cyanogen_crespo4g.mk
@@ -4,16 +4,13 @@
# Inherit some common cyanogenmod stuff.
$(call inherit-product, vendor/cyanogen/products/common_full.mk)
-# Include GSM stuff
-$(call inherit-product, vendor/cyanogen/products/gsm.mk)
-
#
# Setup device specific product configuration.
#
PRODUCT_NAME := cyanogen_crespo4g
PRODUCT_BRAND := google
PRODUCT_DEVICE := crespo4g
-PRODUCT_MODEL := Nexus S
+PRODUCT_MODEL := Nexus S 4G
PRODUCT_MANUFACTURER := samsung
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys" BUILD_NUMBER=121341
@@ -23,12 +20,6 @@
# Add the Torch app
PRODUCT_PACKAGES += Torch
-# Extra RIL settings
-PRODUCT_PROPERTY_OVERRIDES += \
- ro.ril.enable.managed.roaming=1 \
- ro.ril.oem.nosim.ecclist=911,112,999,000,08,118,120,122,110,119,995 \
- ro.ril.emc.mode=2
-
#
# Set ro.modversion
#