commit c0e7c1c372c9a2fe9307b2198fa2510ee4041fc9
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> Sat Oct 08 02:24:10 2011 +0400
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Sat Oct 08 02:24:10 2011 +0400
tree 3a4c26ea6f8b14f44e93ead8434ba8a7fa2ec296
parent ec3c9da7e3d5146fa0971741dfd422c6428b4a09
parent 90e4aa464dfda1965cb4c7eb107d3ed834e70748

Merge "AT&T Samsung Galaxy SII" into gingerbread

prebuilt/common/bin/modelid_cfg.sh

diff --git a/prebuilt/common/bin/modelid_cfg.sh b/prebuilt/common/bin/modelid_cfg.sh
index 175dc3d..81676c3 100644
--- a/prebuilt/common/bin/modelid_cfg.sh
+++ b/prebuilt/common/bin/modelid_cfg.sh
@@ -48,6 +48,7 @@
 cat /proc/cmdline | egrep -q '(PD9812000)|(PD9814000)'
       if [ $? = 0 ];
          then
+            mv /system/etc/nam/default* /system/etc/firmware/
             mv /system/etc/nam/CodecDSPID_MCLK.txt /system/etc
             mv /system/etc/nam/*MCLK.txt /system/etc/soundimage/
             mv /system/etc/nam/AdieHWCodec.csv /system/etc

products/cyanogen_jordan.mk

diff --git a/products/cyanogen_jordan.mk b/products/cyanogen_jordan.mk
index ed4fa77..50a7db6 100644
--- a/products/cyanogen_jordan.mk
+++ b/products/cyanogen_jordan.mk
@@ -38,13 +38,13 @@
 DATE     := $(shell date +%Y%m%d)
 
 PRODUCT_BUILD_PROP_OVERRIDES := \
-BUILD_ID=GRJ90 \
-BUILD_DISPLAY_ID="Gingerbread GRJ90" \
+BUILD_ID=GWK74 \
+BUILD_DISPLAY_ID="Gingerbread GWK74" \
 PRODUCT_NAME=${PRODUCT_MODEL}_${PRODUCT_SFX} \
 TARGET_DEVICE=umts_jordan \
-BUILD_FINGERPRINT=MOTO/${PRODUCT_MODEL}_${PRODUCT_SFX}/umts_jordan/jordan:2.3.5/${PRODUCT_SBF}/${UTC_DATE}:user/release-keys \
+BUILD_FINGERPRINT=MOTO/${PRODUCT_MODEL}_${PRODUCT_SFX}/umts_jordan/jordan:2.3.7/${PRODUCT_SBF}/${UTC_DATE}:user/release-keys \
 PRODUCT_BRAND=MOTO \
-PRIVATE_BUILD_DESC="umts_jordan-user 2.3.5 ${PRODUCT_SFX}_${PRODUCT_SBF} ${UTC_DATE} release-keys" \
+PRIVATE_BUILD_DESC="umts_jordan-user 2.3.7 ${PRODUCT_SFX}_${PRODUCT_SBF} ${UTC_DATE} release-keys" \
 BUILD_NUMBER=${DATE} \
 BUILD_VERSION_TAGS=release-keys \
 TARGET_BUILD_TYPE=user \
@@ -59,3 +59,4 @@
 # Add the Torch app
 PRODUCT_PACKAGES += \
     Torch
+