Merge "Fix endless boot-loop on ldpi, when using bg-color/image on lockscreen" into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index f9c0c45..cc73e10 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -30,7 +30,7 @@
* Buzz (Wildfire): Jacob Crawley, Arne Coucheron
* Harmony (Malata smb_a1002/smb_b9701): bekit, pershoot
* Harmony (Malata smb_a1004/smb_a1011): arcee
-* Ace (Desire HD): Kali-
+* Ace (Desire HD/Inspire 4G): Kali-, jznomoney, attn1
* Glacier (MT4G): Zinx, Kmobs, cyanogen
* Click (Tattoo): KalimochoAz
* Blade (San Francisco, Sapo A5, others): Tom Giordano and Jacob Crawley
@@ -42,7 +42,8 @@
* Galaxy S (GT-I9000): coolya, codeworkx, atinm, GuiperPT, Unhelpful
* Captivate (SGH-I896/SGH-I897): atinm, Unhelpful, coolya, codeworkx
* Vibrant (SGH-T959): coolya, atinm, codeworkx, Unhelpful
-* Incredible S: Kali-, attn1
+* Vivo (Incredible S): Kali-, attn1
+* Vivow (Incredible 2): Kali-, attn1
* Jordan (Defy): Quarx, Epsylon3, maniac103
* Droid2 (MotoA955): JBirdVegas, RevNumbers
* Galaxy S II (GT-I9100): atinm, codeworkx, coolya, GuiperPT, Unhelpful
@@ -103,8 +104,9 @@
* Common: Bluetooth tethering - Stéphane Konstantaropoulos
* Click, Motorola: Speed up photo recording - Emilio López
* Click, Motorola: Add Geolocation to photo app - KalimochoAz
-* Vision/Glacier/Ace/Speedy/Vivo: 2.6.35 kernel and updated userspace
+* Vision/Glacier/Ace/Speedy/Vivo/Vivow: 2.6.35 kernel and updated userspace
* Buzz: 2.6.35 kernel - Arne Coucheron
+* Bravo(c)/Vivo(w)/Ace/Liberty: On charge notification led - Richard Antony Burton
### 7.0.3
* Common: Don't allow packages with platform keys on user-controlled storage
diff --git a/products/cyanogen_vivo.mk b/products/cyanogen_vivo.mk
index ea28441..7bef5b7 100644
--- a/products/cyanogen_vivo.mk
+++ b/products/cyanogen_vivo.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := vivo
PRODUCT_MODEL := Incredible S
PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivo BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=htc_wwe/htc_vivo/vivo:2.3.3/GRI40/47853:user/release-keys PRIVATE_BUILD_DESC="2.36.405.8 CL47853 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_vivo BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=htc_wwe/htc_vivo/vivo:2.3.3/GRI40/88716:user/release-keys PRIVATE_BUILD_DESC="2.30.405.1 CL88716 release-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=