Merge "Add Telus NAM config; use egrep where more appropriate than grep" into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 5cfd31c..242a013 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -98,9 +98,10 @@
* Common: Now playing and album art on lockscreen - kmobs
* Common: GPS fixes - CodeAurora, arcee
* Common: Breakfast/Brunch - arcee
-* Common: Statusbar battery percentage with mini icon - Sven Dawitz
+* Common: Statusbar battery percentage with mini icon - Sven Dawitz, design by Jazz Kalsi
* Common: SMS split for braindead carriers - Mike Wielgosz
* Common: CMParts cleanup - Sven Dawitz
+* Common: Notification profiles - Martin Long
* Espresso/Legend: Enabled native WiFi tethering - Cyanogen, OMAPZoom.org
* Z71: Enabled MPEG4/AAC video recording - arcee
* Z71: Enabled native WiFi tethering - arcee
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 2b72e59..a79c70e 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -6,6 +6,7 @@
$(LOCAL_DIR)/cyanogen_buzz.mk \
$(LOCAL_DIR)/cyanogen_click.mk \
$(LOCAL_DIR)/cyanogen_crespo.mk \
+ $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
$(LOCAL_DIR)/cyanogen_encore.mk \
$(LOCAL_DIR)/cyanogen_espresso.mk \
$(LOCAL_DIR)/cyanogen_hero.mk \
@@ -23,4 +24,3 @@
$(LOCAL_DIR)/cyanogen_supersonic.mk \
$(LOCAL_DIR)/cyanogen_vision.mk \
$(LOCAL_DIR)/cyanogen_z71.mk
-# $(LOCAL_DIR)/cyanogen_dream_sapphire.mk \
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 6facc68..3576795 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -18,9 +18,9 @@
PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRI40 BUILD_FINGERPRINT=tmobile/opal/sapphire/sapphire:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="opal-user 2.2.1 FRG83 60505 release-keys"
# Build kernel
-PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
-PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
# Extra DS overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 3e5860f..5b6103f 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -5,7 +5,7 @@
add_lunch_combo cyanogen_buzz-eng
add_lunch_combo cyanogen_click-eng
add_lunch_combo cyanogen_crespo-eng
-#add_lunch_combo cyanogen_dream_sapphire-eng
+add_lunch_combo cyanogen_dream_sapphire-eng
add_lunch_combo cyanogen_encore-eng
add_lunch_combo cyanogen_espresso-eng
add_lunch_combo cyanogen_generic-eng