Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee4c710f authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_vendor_cm into cm-12.1

parents b3be4f98 75271cfd

CONTRIBUTORS.mkdn

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ Maintainers (CyanogenMod 12.0): 
* __LG G3 (Verizon) (VS985):__ invisiblek

* __LG Optimus LTE (P930) / LG Nitro HD {P935):__ arcee

* __LG Optimus LTE (SK Telecom) (SU640):__ arcee

* __Moto E 2014 (xt1021,xt1022,xt1023/condor):__ percy_g2, scritch007

* __Moto G 4G (xt1039,xt1040,xt1042,xt1045/peregrine):__ somcom3x, intervigil

* __Moto X (xt1053,xt1055,xt1056,xt1058,xt1060/ghost):__ Hashcode, Skrilax_CZ

* __Moto X 2014 (victara):__ crpalmer

config/common_full_phone.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ $(call inherit-product, vendor/cm/config/common_full.mk) 
# Default notification/alarm sounds

PRODUCT_PROPERTY_OVERRIDES += \

    ro.config.notification_sound=Argon.ogg \

    ro.config.alarm_alert=Hassium.ogg

    ro.config.alarm_alert=Helium.ogg



ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))

    PRODUCT_COPY_FILES += \

config/common_full_tablet_wifionly.mk

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ $(call inherit-product, vendor/cm/config/common_full.mk) 
# Default notification/alarm sounds

PRODUCT_PROPERTY_OVERRIDES += \

    ro.config.notification_sound=Argon.ogg \

    ro.config.alarm_alert=Hassium.ogg

    ro.config.alarm_alert=Helium.ogg



ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))

    PRODUCT_COPY_FILES += \

config/common_mini_phone.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ include vendor/cm/config/cm_audio.mk 
# Default notification/alarm sounds

PRODUCT_PROPERTY_OVERRIDES += \

    ro.config.notification_sound=Argon.ogg \

    ro.config.alarm_alert=Hassium.ogg

    ro.config.alarm_alert=Helium.ogg



ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))

    PRODUCT_COPY_FILES += \

config/common_mini_tablet_wifionly.mk

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ include vendor/cm/config/cm_audio.mk 
# Default notification/alarm sounds

PRODUCT_PROPERTY_OVERRIDES += \

    ro.config.notification_sound=Argon.ogg \

    ro.config.alarm_alert=Hassium.ogg

    ro.config.alarm_alert=Helium.ogg



ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))

    PRODUCT_COPY_FILES += \