diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-23 16:25:26 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-23 16:25:26 -0700 |
commit | be19f9f499e3154b63d222bebef5da3a26261206 (patch) | |
tree | c96d73c2518cceb87deb1f3f36cbb7fae6bc4195 /data | |
parent | 53305e832635c78318bfa0ad49129412f780a556 (diff) | |
parent | 3867301423b5fce95b4b86313bc55e0be5e06c6b (diff) | |
download | frameworks_base-be19f9f499e3154b63d222bebef5da3a26261206.zip frameworks_base-be19f9f499e3154b63d222bebef5da3a26261206.tar.gz frameworks_base-be19f9f499e3154b63d222bebef5da3a26261206.tar.bz2 |
am 38673014: Merge change 8336 into donut
Merge commit '3867301423b5fce95b4b86313bc55e0be5e06c6b'
* commit '3867301423b5fce95b4b86313bc55e0be5e06c6b':
Remove the silent ringtone.
Diffstat (limited to 'data')
-rw-r--r-- | data/sounds/AudioPackage2.mk | 1 | ||||
-rw-r--r-- | data/sounds/OriginalAudio.mk | 1 | ||||
-rw-r--r-- | data/sounds/Silence.ogg | bin | 3973 -> 0 bytes |
3 files changed, 0 insertions, 2 deletions
diff --git a/data/sounds/AudioPackage2.mk b/data/sounds/AudioPackage2.mk index 649787e..5dacc70 100644 --- a/data/sounds/AudioPackage2.mk +++ b/data/sounds/AudioPackage2.mk @@ -23,7 +23,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/Silence.ogg:system/media/audio/ringtones/notifications/Silence.ogg \ $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ diff --git a/data/sounds/OriginalAudio.mk b/data/sounds/OriginalAudio.mk index fc1e921..291f0b6 100644 --- a/data/sounds/OriginalAudio.mk +++ b/data/sounds/OriginalAudio.mk @@ -22,7 +22,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/Ring_Digital_02.ogg:system/media/audio/ringtones/Ring_Digital_02.ogg \ $(LOCAL_PATH)/Ring_Synth_04.ogg:system/media/audio/ringtones/Ring_Synth_04.ogg \ $(LOCAL_PATH)/Ring_Synth_02.ogg:system/media/audio/ringtones/Ring_Synth_02.ogg \ - $(LOCAL_PATH)/Silence.ogg:system/media/audio/ringtones/notifications/Silence.ogg \ $(LOCAL_PATH)/newwavelabs/BeatPlucker.ogg:system/media/audio/ringtones/BeatPlucker.ogg \ $(LOCAL_PATH)/newwavelabs/BentleyDubs.ogg:system/media/audio/ringtones/BentleyDubs.ogg \ $(LOCAL_PATH)/newwavelabs/BirdLoop.ogg:system/media/audio/ringtones/BirdLoop.ogg \ diff --git a/data/sounds/Silence.ogg b/data/sounds/Silence.ogg Binary files differdeleted file mode 100644 index 6d78907..0000000 --- a/data/sounds/Silence.ogg +++ /dev/null |