Merge "ldpi: Adjust for FM flexible layout" into gingerbread
diff --git a/overlay/jordan/packages/apps/Camera/res/values/config.xml b/overlay/jordan/packages/apps/Camera/res/values/config.xml
index a6efecd..0469b05 100644
--- a/overlay/jordan/packages/apps/Camera/res/values/config.xml
+++ b/overlay/jordan/packages/apps/Camera/res/values/config.xml
@@ -16,12 +16,13 @@
** limitations under the License.
*/
-->
-
-<!-- These resources are around just to allow their values to be customized
- for different hardware and product builds. -->
<resources>
- <!-- Wide media profile available -->
- <bool name="supportsWideProfile">true</bool>
+ <!-- Wide media profile available -->
+ <bool name="supportsWideProfile">true</bool>
+
+ <!-- Autofocus parameters -->
+ <string name="touchFocusParameter">mot-areas-to-focus</string>
+ <bool name="touchFocusNeedsRect">true</bool>
</resources>
diff --git a/overlay/leo/packages/apps/CMParts/res/values/config.xml b/overlay/leo/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index 1f71848..0000000
--- a/overlay/leo/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- Whether or not to display the trackball settings -->
- <bool name="has_trackball">false</bool>
- <bool name="has_rgb_notification_led">false</bool>
-
- <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/olympus/packages/apps/CMParts/res/values/config.xml b/overlay/olympus/packages/apps/CMParts/res/values/config.xml
deleted file mode 100644
index f49f9fc..0000000
--- a/overlay/olympus/packages/apps/CMParts/res/values/config.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- Whether or not to display the trackball settings -->
- <bool name="has_trackball">false</bool>
- <bool name="has_rgb_notification_led">true</bool>
- <bool name="has_camera_button">false</bool>
- <bool name="has_led_flash">true</bool>
-</resources>
diff --git a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
index d6c047a..61a9d3b 100644
--- a/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
+++ b/overlay/tablet/frameworks/base/core/res/res/values-ru/strings.xml
@@ -22,17 +22,17 @@
<string name="lockscreen_carrier_default"></string>
<!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
- <string name="power_dialog">Параметры планшета</string>
+ <string name="power_dialog">Параметры планшетного ПК</string>
<!-- Button to reboot the phone, within the Phone Options dialog -->
<string name="reboot_system">Перезагрузить</string>
<!-- Shutdown Confirmation Dialog. When the user chooses to power off the phone, there will be a confirmation dialog. This is the message. -->
- <string name="shutdown_confirm">Планшет будет выключен.</string>
+ <string name="shutdown_confirm">Планшетный ПК будет выключен.</string>
<!-- Reboot Confirmation Dialog. When the user chooses to reboot the phone, there will be a confirmation dialog. This is the message. -->
- <string name="reboot_confirm">Планшет будет перезагружен.</string>
+ <string name="reboot_confirm">Планшетный ПК будет перезагружен.</string>
<!-- Title of the Global Actions Dialog -->
- <string name="global_actions">Параметры планшета</string>
+ <string name="global_actions">Параметры планшетного ПК</string>
</resources>
diff --git a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
index 9e92bb3..c5ded5d 100644
--- a/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
+++ b/overlay/tablet/packages/apps/Settings/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Main settings screen, setting title for the user to go into the About phone screen -->
- <string name="about_settings">О планшете</string>
+ <string name="about_settings">О планшетном ПК</string>
</resources>
diff --git a/prebuilt/common/etc/spn-conf.xml b/prebuilt/common/etc/spn-conf.xml
index 633a1a2..32b6f1a 100644
--- a/prebuilt/common/etc/spn-conf.xml
+++ b/prebuilt/common/etc/spn-conf.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<spnOverrides>
+ <!-- Japan -->
+ <spnOverride numeric="44020" spn="SoftBank"/>
<!-- Hong Kong -->
+ <spnOverride numeric="45406" spn="SmarTone" />
<spnOverride numeric="45412" spn="中國移動" />
<!-- China -->
<spnOverride numeric="46000" spn="中国移动" />
diff --git a/prebuilt/leo/etc/init.d/01modules b/prebuilt/leo/etc/init.d/01modules
deleted file mode 100755
index 77c2bec..0000000
--- a/prebuilt/leo/etc/init.d/01modules
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/system/bin/sh
-#
-# Load MODULES
-sleep 1
-insmod /system/lib/modules/msm_rmnet.ko
-insmod /system/lib/modules/tun.ko
-insmod /system/lib/modules/cifs.ko
-insmod /system/lib/modules/nls_utf8.ko
-insmod /system/lib/modules/fuse.ko
-echo "+++ RMNET / TUN / CIFS activated +++";
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 67dddcf..6caf3d4 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -7,6 +7,7 @@
$(LOCAL_DIR)/cyanogen_buzz.mk \
$(LOCAL_DIR)/cyanogen_captivatemtd.mk \
$(LOCAL_DIR)/cyanogen_click.mk \
+ $(LOCAL_DIR)/cyanogen_coconut.mk \
$(LOCAL_DIR)/cyanogen_crespo.mk \
$(LOCAL_DIR)/cyanogen_crespo4g.mk \
$(LOCAL_DIR)/cyanogen_desirec.mk \
@@ -21,6 +22,7 @@
$(LOCAL_DIR)/cyanogen_hero.mk \
$(LOCAL_DIR)/cyanogen_heroc.mk \
$(LOCAL_DIR)/cyanogen_inc.mk \
+ $(LOCAL_DIR)/cyanogen_iyokan.mk \
$(LOCAL_DIR)/cyanogen_jordan.mk \
$(LOCAL_DIR)/cyanogen_galaxys2.mk \
$(LOCAL_DIR)/cyanogen_galaxys2att.mk \
@@ -43,6 +45,7 @@
$(LOCAL_DIR)/cyanogen_passion.mk \
$(LOCAL_DIR)/cyanogen_robyn.mk \
$(LOCAL_DIR)/cyanogen_saga.mk \
+ $(LOCAL_DIR)/cyanogen_satsuma.mk \
$(LOCAL_DIR)/cyanogen_shadow.mk \
$(LOCAL_DIR)/cyanogen_shakira.mk \
$(LOCAL_DIR)/cyanogen_sholes.mk \
@@ -54,11 +57,11 @@
$(LOCAL_DIR)/cyanogen_smultron.mk \
$(LOCAL_DIR)/cyanogen_speedy.mk \
$(LOCAL_DIR)/cyanogen_supersonic.mk \
- $(LOCAL_DIR)/cyanogen_v9.mk \
$(LOCAL_DIR)/cyanogen_tass.mk \
$(LOCAL_DIR)/cyanogen_u8150.mk \
$(LOCAL_DIR)/cyanogen_u8220.mk \
$(LOCAL_DIR)/cyanogen_urushi.mk \
+ $(LOCAL_DIR)/cyanogen_v9.mk \
$(LOCAL_DIR)/cyanogen_vega.mk \
$(LOCAL_DIR)/cyanogen_vibrantmtd.mk \
$(LOCAL_DIR)/cyanogen_vision.mk \
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
index bb35d6d..23a51eb 100644
--- a/products/cyanogen_anzu.mk
+++ b/products/cyanogen_anzu.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := anzu
PRODUCT_MODEL := LT15i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT15i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/LT15i_1247-1061/LT15i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=LT15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/LT15i_1247-1061/LT15i:2.3.4/4.0.2.A.0.42/bn_P:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.4 4.0.3.A.0.42 bn_P test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_coconut.mk b/products/cyanogen_coconut.mk
new file mode 100644
index 0000000..4a66ae4
--- /dev/null
+++ b/products/cyanogen_coconut.mk
@@ -0,0 +1,43 @@
+# Inherit device configuration for coconut.
+$(call inherit-product, device/semc/coconut/device_coconut.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_coconut
+PRODUCT_BRAND := SEMC
+PRODUCT_DEVICE := coconut
+PRODUCT_MODEL := WT19i
+PRODUCT_MANUFACTURER := Sony Ericsson
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=WT19i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/WT19i_1249-6227/WT19i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="WT19i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_coconut_defconfig
+
+# Extra coconut overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/coconut
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+# BCM FM radio
+#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := LiveWithWalkman-WT19i
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index c707295..27e805f 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := hallon
PRODUCT_MODEL := MT15i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.3/3.0.1.A.0.145/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MT15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/MT15i_1247-0875/MT15i:2.3.4/4.0.2.A.0.42/bn_P:user/release-keys PRIVATE_BUILD_DESC="MT15i-user 2.3.4 4.0.2.A.0.42 bn_P test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_iyokan.mk b/products/cyanogen_iyokan.mk
new file mode 100644
index 0000000..85d1f26
--- /dev/null
+++ b/products/cyanogen_iyokan.mk
@@ -0,0 +1,44 @@
+# Inherit device configuration for iyokan.
+$(call inherit-product, device/semc/iyokan/device_iyokan.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_iyokan
+PRODUCT_BRAND := SEMC
+PRODUCT_DEVICE := iyokan
+PRODUCT_MODEL := MK16i
+PRODUCT_MANUFACTURER := Sony Ericsson
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=MK16i BUILD_ID=4.0.1.A.0.283 BUILD_FINGERPRINT=SEMC/MK16i_1247-1061/MK16i:2.3.4/4.0.1.A.0.283/bn_P:user/release-keys PRIVATE_BUILD_DESC="MK16i-user 2.3.4 4.0.1.A.0.283 bn_P test-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_iyokan_defconfig
+
+# Extra iyokan overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/iyokan
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
+
+
+# BCM FM radio
+#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := XperiaPro-MK16i
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_leo.mk b/products/cyanogen_leo.mk
index 726f693..8d80f50 100644
--- a/products/cyanogen_leo.mk
+++ b/products/cyanogen_leo.mk
@@ -21,10 +21,6 @@
# Extra leo overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/leo
-# This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script
-PRODUCT_COPY_FILES += \
- vendor/cyanogen/prebuilt/leo/etc/init.d/01modules:system/etc/init.d/01modules \
-
# Extra RIL settings
PRODUCT_PROPERTY_OVERRIDES += \
ro.ril.enable.managed.roaming=1 \
diff --git a/products/cyanogen_mango.mk b/products/cyanogen_mango.mk
index 77a1533..6fce3ea 100644
--- a/products/cyanogen_mango.mk
+++ b/products/cyanogen_mango.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := mango
PRODUCT_MODEL := SK17i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=SK17i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/SK17i_1249-8062/SK17i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="SK17i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_satsuma.mk b/products/cyanogen_satsuma.mk
new file mode 100644
index 0000000..9997d59
--- /dev/null
+++ b/products/cyanogen_satsuma.mk
@@ -0,0 +1,44 @@
+# Inherit device configuration for satsuma.
+$(call inherit-product, device/semc/satsuma/device_satsuma.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_satsuma
+PRODUCT_BRAND := SEMC
+PRODUCT_DEVICE := satsuma
+PRODUCT_MODEL := ST17i
+PRODUCT_MANUFACTURER := Sony Ericsson
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST17i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/ST17i_1249-6227/ST17i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST17i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_satsuma_defconfig
+
+# Extra satsuma overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/satsuma
+
+# Add the Torch app
+#PRODUCT_PACKAGES += Torch
+
+
+# BCM FM radio
+#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := XperiaActive-ST17i
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy passion specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_smultron.mk b/products/cyanogen_smultron.mk
index 631bc03..44e0768 100644
--- a/products/cyanogen_smultron.mk
+++ b/products/cyanogen_smultron.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := smultron
PRODUCT_MODEL := ST15i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST15i BUILD_ID=4.0.A.2.368 BUILD_FINGERPRINT=SEMC/ST15i_1249-6227/ST15i:2.3.3/4.0.A.2.368/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST15i-user 2.3.3 4.0.A.2.368 j_b_3w test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=ST15i BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/ST15i_1249-6227/ST15i:2.3.4/4.0.2.A.0.42/j_b_3w:user/release-keys PRIVATE_BUILD_DESC="ST15i-user 2.3.4 4.0.2.A.0.42 j_b_3w test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/smultron
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk
index fcf09cc..151cce9 100644
--- a/products/cyanogen_zeus.mk
+++ b/products/cyanogen_zeus.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := zeus
PRODUCT_MODEL := R800i
PRODUCT_MANUFACTURER := Sony Ericsson
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=4.0.2.A.0.42 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.4/4.0.2.A.0.42/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.4 4.0.2.A.0.42 bn_P test-keys"
# Build kernel
#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
diff --git a/products/cyanogen_zeusc.mk b/products/cyanogen_zeusc.mk
index 2ff9d07..07037a3 100644
--- a/products/cyanogen_zeusc.mk
+++ b/products/cyanogen_zeusc.mk
@@ -1,4 +1,4 @@
-# Inherit device configuration for zeus.
+# Inherit device configuration for zeusc.
$(call inherit-product, device/semc/zeusc/device_zeusc.mk)
# Inherit some common cyanogenmod stuff.
@@ -24,7 +24,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeusc
# Add the Torch app
-PRODUCT_PACKAGES += Torch
+#PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 37586d6..6a304fa 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -6,6 +6,7 @@
add_lunch_combo cyanogen_buzz-eng
add_lunch_combo cyanogen_click-eng
add_lunch_combo cyanogen_captivatemtd-eng
+add_lunch_combo cyanogen_coconut-eng
add_lunch_combo cyanogen_crespo-eng
add_lunch_combo cyanogen_crespo4g-eng
add_lunch_combo cyanogen_desirec-eng
@@ -25,6 +26,7 @@
add_lunch_combo cyanogen_hero-eng
add_lunch_combo cyanogen_heroc-eng
add_lunch_combo cyanogen_inc-eng
+add_lunch_combo cyanogen_iyokan-eng
add_lunch_combo cyanogen_jordan-eng
add_lunch_combo cyanogen_legend-eng
add_lunch_combo cyanogen_leo-eng
@@ -42,6 +44,7 @@
add_lunch_combo cyanogen_passion-eng
add_lunch_combo cyanogen_robyn-eng
add_lunch_combo cyanogen_saga-eng
+add_lunch_combo cyanogen_satsuma-eng
add_lunch_combo cyanogen_shadow-eng
add_lunch_combo cyanogen_shakira-eng
add_lunch_combo cyanogen_sholes-eng