Merge "legend: Update for release" into froyo
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 727988b..697f681 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -17,8 +17,9 @@
* Hero: Lox (GSM), Darchstar (CDMA)
* Desire (GSM/CDMA): Kali-, Defer
* Incredible: Koush
-* Espresso (Slide): Wes Garner, Chris Soyars, Cyanogen
* Supersonic (EVO): Cyanogen, toastcfh
+* Espresso (Slide): Cyanogen, Wes Garner
+* Liberty (Aria): attn1, jznomoney
* Legend: Alexander Hofbauer
* Vision (G2/Desire Z): Cyanogen
* Geeksphone ONE: arcee
@@ -42,6 +43,10 @@
CHANGELOG
---------
+### 6.1.1
+* Vision: Fix MMS over WiFi calling - Zinx
+* Vision: Add console=null to kernel command line - Adam Tygart
+
### 6.1.0
* Common: Update to Android 2.2.1
* Common: Various bugfixes from AOSP and CodeAurora
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 578c1a5..a62a07f 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := passion
PRODUCT_MODEL := Nexus One
PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=FRG83 BUILD_DISPLAY_ID=FRG83 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83/60505:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83 60505 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=FRG83D BUILD_DISPLAY_ID=FRG83D BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2.1/FRG83D/75603:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.2.1 FRG83D 75603 release-keys"
# Build kernel
PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 555bfd5..08ed367 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -24,7 +24,7 @@
ro.modversion=CyanogenMod-6.1.0-Droid
endif
-PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG22D BUILD_DISPLAY_ID=FRG22D PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRG22D/50454:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRG22D 50454 release-keys" BUILD_NUMBER=50454 BUILD_UTC_DATE=1278333946 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
+PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=FRG83D PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRG83D/75603:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRG83D 75603 release-keys" BUILD_NUMBER=75603 BUILD_UTC_DATE=1289367602 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
PRODUCT_COPY_FILES += \
vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip