Merge "cm audio: update sounds, add new ones" into cm-10.1
diff --git a/config/cm_audio.mk b/config/cm_audio.mk
index 668009f..eb145e8 100644
--- a/config/cm_audio.mk
+++ b/config/cm_audio.mk
@@ -17,6 +17,7 @@
$(NOTIFICATION_PATH)/CyanMessage.ogg:system/media/audio/notifications/CyanMessage.ogg \
$(NOTIFICATION_PATH)/CyanPing.ogg:system/media/audio/notifications/CyanPing.ogg \
$(NOTIFICATION_PATH)/Doink.ogg:system/media/audio/notifications/Doink.ogg \
+ $(NOTIFICATION_PATH)/Laser.ogg:system/media/audio/notifications/Laser.ogg \
$(NOTIFICATION_PATH)/Naughty.ogg:system/media/audio/notifications/Naughty.ogg \
$(NOTIFICATION_PATH)/Pong.ogg:system/media/audio/notifications/Pong.ogg \
$(NOTIFICATION_PATH)/Rang.ogg:system/media/audio/notifications/Rang.ogg \
@@ -28,6 +29,9 @@
$(RINGTONE_PATH)/Boxbeat.ogg:system/media/audio/ringtones/Boxbeat.ogg \
$(RINGTONE_PATH)/CyanTone.ogg:system/media/audio/ringtones/CyanTone.ogg \
$(RINGTONE_PATH)/Gigolo.ogg:system/media/audio/ringtones/Gigolo.ogg \
+ $(RINGTONE_PATH)/Highscore.ogg:system/media/audio/ringtones/Highscore.ogg \
$(RINGTONE_PATH)/House_of_house.ogg:system/media/audio/ringtones/House_of_house.ogg \
+ $(RINGTONE_PATH)/Lyon.ogg:system/media/audio/ringtones/Lyon.ogg \
+ $(RINGTONE_PATH)/Rockin.ogg:system/media/audio/ringtones/Rockin.ogg \
$(RINGTONE_PATH)/Silmarillia.ogg:system/media/audio/ringtones/Silmarillia.ogg
diff --git a/prebuilt/common/media/audio/alarms/CyanAlarm.ogg b/prebuilt/common/media/audio/alarms/CyanAlarm.ogg
index 4838e5d..6755bb8 100644
--- a/prebuilt/common/media/audio/alarms/CyanAlarm.ogg
+++ b/prebuilt/common/media/audio/alarms/CyanAlarm.ogg
Binary files differ
diff --git a/prebuilt/common/media/audio/notifications/CyanMail.ogg b/prebuilt/common/media/audio/notifications/CyanMail.ogg
index 211886c..9b6d8c1 100644
--- a/prebuilt/common/media/audio/notifications/CyanMail.ogg
+++ b/prebuilt/common/media/audio/notifications/CyanMail.ogg
Binary files differ
diff --git a/prebuilt/common/media/audio/notifications/CyanMessage.ogg b/prebuilt/common/media/audio/notifications/CyanMessage.ogg
index e85f716..415bfdf 100644
--- a/prebuilt/common/media/audio/notifications/CyanMessage.ogg
+++ b/prebuilt/common/media/audio/notifications/CyanMessage.ogg
Binary files differ
diff --git a/prebuilt/common/media/audio/notifications/Laser.ogg b/prebuilt/common/media/audio/notifications/Laser.ogg
new file mode 100644
index 0000000..2448c52
--- /dev/null
+++ b/prebuilt/common/media/audio/notifications/Laser.ogg
Binary files differ
diff --git a/prebuilt/common/media/audio/ringtones/Highscore.ogg b/prebuilt/common/media/audio/ringtones/Highscore.ogg
new file mode 100644
index 0000000..fe07c89
--- /dev/null
+++ b/prebuilt/common/media/audio/ringtones/Highscore.ogg
Binary files differ
diff --git a/prebuilt/common/media/audio/ringtones/Lyon.ogg b/prebuilt/common/media/audio/ringtones/Lyon.ogg
new file mode 100644
index 0000000..3e4c925
--- /dev/null
+++ b/prebuilt/common/media/audio/ringtones/Lyon.ogg
Binary files differ
diff --git a/prebuilt/common/media/audio/ringtones/Rockin.ogg b/prebuilt/common/media/audio/ringtones/Rockin.ogg
new file mode 100644
index 0000000..d48554d
--- /dev/null
+++ b/prebuilt/common/media/audio/ringtones/Rockin.ogg
Binary files differ