Merge "Fix LDPI status_bar_expanded overlay" into gingerbread
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
index ddae548..debe393 100755
--- a/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
+++ b/overlay/tablet/frameworks/base/core/res/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="power_dialog">Confirações do tablet</string>
+ <string name="power_dialog">Configurações do tablet</string>
<string name="reboot_system">Reiniciar tablet</string>
<string name="shutdown_confirm">Seu tablet irá desligar.</string>
<string name="reboot_confirm">Seu tablet irá reiniciar.</string>
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 3953b5e..dc4590a 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -59,6 +59,7 @@
app/soundback.apk
app/Street.apk
app/Talk.apk
+app/Talk2.apk
app/talkback.apk
app/Twitter.apk
app/Vending.apk
@@ -68,6 +69,7 @@
etc/permissions/features.xml
framework/com.google.android.maps.jar
lib/libspeech.so
+lib/libtalk_jni.so
lib/libvoicesearch.so
etc/hosts
etc/custom_backup_list.txt
diff --git a/products/cyanogen_crespo.mk b/products/cyanogen_crespo.mk
index 00d71ec..1494f63 100644
--- a/products/cyanogen_crespo.mk
+++ b/products/cyanogen_crespo.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := crespo
PRODUCT_MODEL := Nexus S
PRODUCT_MANUFACTURER := Samsung
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.3 GRI40 102588 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys"
# Extra Crespo overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/crespo
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index 65e3d75..8ad395e 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -20,6 +20,9 @@
# Add the Torch app
PRODUCT_PACKAGES += Torch
+# Add AicBootFix
+PRODUCT_PACKAGES += AicBootFix
+
# Broadcom FM radio
$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 8bbb348..e1ee0b7 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=GRI40 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=passion BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
# Build kernel
PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=