diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-15 14:39:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-15 14:39:48 -0700 |
| commit | 5b9aa652a0a9275ae0563d29679ffc2bc2238389 (patch) | |
| tree | b9a71d2e8b260316d5abb8938ab3a1dc815e84db /data | |
| parent | d7f2036aaa9f934893703d4314d355aef3ffadcb (diff) | |
| parent | 37b939a63742c9a0cea4e6982bfb0581def45d6d (diff) | |
| download | frameworks_base-5b9aa652a0a9275ae0563d29679ffc2bc2238389.zip frameworks_base-5b9aa652a0a9275ae0563d29679ffc2bc2238389.tar.gz frameworks_base-5b9aa652a0a9275ae0563d29679ffc2bc2238389.tar.bz2 | |
am 37b939a6: Merge change 7395 into donut
Merge commit '37b939a63742c9a0cea4e6982bfb0581def45d6d'
* commit '37b939a63742c9a0cea4e6982bfb0581def45d6d':
Move the silent ringtone to ringtones/notifications, so it can be used for both.
Diffstat (limited to 'data')
| -rw-r--r-- | data/sounds/AudioPackage2.mk | 2 | ||||
| -rw-r--r-- | data/sounds/OriginalAudio.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/sounds/AudioPackage2.mk b/data/sounds/AudioPackage2.mk index aea3f0b..649787e 100644 --- a/data/sounds/AudioPackage2.mk +++ b/data/sounds/AudioPackage2.mk @@ -23,7 +23,7 @@ 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/Silence.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 8c8fc32..fc1e921 100644 --- a/data/sounds/OriginalAudio.mk +++ b/data/sounds/OriginalAudio.mk @@ -22,7 +22,7 @@ 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/Silence.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 \ |