summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalimochoAz <calimochoazucarado@gmail.com>2012-04-04 14:41:06 +0400
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2012-04-04 14:41:06 +0400
commitd733e00d8013bb299609cab89b14d5bde60f74ac (patch)
treeaa360b4d03f3be6d7d0195ebc88640a0ebd18a22
parentc6ddcd5db34c6833298ce9d553e31847cf094253 (diff)
parent33813157ce134a8a881d6800e7c3d8532f91c360 (diff)
downloaddevice_samsung_crespo-d733e00d8013bb299609cab89b14d5bde60f74ac.zip
device_samsung_crespo-d733e00d8013bb299609cab89b14d5bde60f74ac.tar.gz
device_samsung_crespo-d733e00d8013bb299609cab89b14d5bde60f74ac.tar.bz2
Merge "Incorrect ordering caused the wrong apns-conf to be included" into ics
-rw-r--r--cm.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/cm.mk b/cm.mk
index 19edc50..47a9177 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,11 +1,12 @@
-$(call inherit-product, device/samsung/crespo/full_crespo.mk)
+# Inherit some common CM stuff.
+$(call inherit-product, vendor/cm/config/gsm.mk)
PRODUCT_RELEASE_NAME := NS
# Inherit some common CM stuff.
$(call inherit-product, vendor/cm/config/common_full_phone.mk)
-# Inherit some common CM stuff.
-$(call inherit-product, vendor/cm/config/gsm.mk)
+# Inherit device configuration
+$(call inherit-product, device/samsung/crespo/full_crespo.mk)
# Enhanced NFC
$(call inherit-product, vendor/cm/config/nfc_enhanced.mk)