Merge "changelog, droid rc5" into froyo

This commit is contained in:
Steve Kondik 2010-11-28 08:05:49 +00:00 committed by Gerrit Code Review
commit 9e386921e1
2 changed files with 3 additions and 4 deletions

View File

@ -12,7 +12,7 @@ Follow http://twitter.com/cmsrc for commit-by-commit updates.
Maintainers: Maintainers:
------------ ------------
* Nexus One: Cyanogen * Nexus One: Cyanogen
* Droid: Koush * Droid: optedoblivion, mtwebster
* Dream/Sapphire: Cyanogen * Dream/Sapphire: Cyanogen
* Hero: Lox (GSM), Darchstar (CDMA) * Hero: Lox (GSM), Darchstar (CDMA)
* Desire (GSM/CDMA): Kali-, Defer * Desire (GSM/CDMA): Kali-, Defer
@ -104,9 +104,8 @@ CHANGELOG
* Incredible: Better internal storage support - Josh Stone * Incredible: Better internal storage support - Josh Stone
* Vision: Kernel 2.6.32.21, many improvements, 1.4GHz capable (coolbho3k), new ganeth driver (zinx) * Vision: Kernel 2.6.32.21, many improvements, 1.4GHz capable (coolbho3k), new ganeth driver (zinx)
* Vision: Quickeys implementation - Optedoblivion * Vision: Quickeys implementation - Optedoblivion
* Droid: Kernel 2.6.32.9
** Note on Email update: This requires a one-time wipe of application settings.
Note that this will not affect your accounts themselves.
### 6.0.0 ### 6.0.0
* ANDROID: Google, HTC, Qualcomm, and everybody else. We <3 U * ANDROID: Google, HTC, Qualcomm, and everybody else. We <3 U

View File

@ -21,7 +21,7 @@ ifdef CYANOGEN_NIGHTLY
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
else else
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.modversion=CyanogenMod-6.1.0-RC4-Droid ro.modversion=CyanogenMod-6.1.0-RC5-Droid
endif 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=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