diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-12-11 15:21:02 -0800 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-12-11 15:21:02 -0800 |
| commit | ace7404de8b9a5bd7566027a8a90d36d099a46f4 (patch) | |
| tree | c01fc20897525d49aecd56c4fc6a672fceed3089 /data/sounds | |
| parent | fba73030d674b3cd29ffe8519aa41738b54ae827 (diff) | |
| parent | d7337fb97aab0b28c6ca60f6553d03feb1000991 (diff) | |
| download | frameworks_base-ace7404de8b9a5bd7566027a8a90d36d099a46f4.zip frameworks_base-ace7404de8b9a5bd7566027a8a90d36d099a46f4.tar.gz frameworks_base-ace7404de8b9a5bd7566027a8a90d36d099a46f4.tar.bz2 | |
resolved conflicts for merge of d7337fb9 to master
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
Diffstat (limited to 'data/sounds')
| -rwxr-xr-x | data/sounds/AudioPackage10.mk | 1 | ||||
| -rw-r--r-- | data/sounds/effects/ogg/LowBattery.ogg | bin | 17786 -> 12401 bytes | |||
| -rw-r--r-- | data/sounds/effects/ogg/WirelessChargingStarted.ogg | bin | 0 -> 12025 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/data/sounds/AudioPackage10.mk b/data/sounds/AudioPackage10.mk index a930a54..90d8eaa 100755 --- a/data/sounds/AudioPackage10.mk +++ b/data/sounds/AudioPackage10.mk @@ -29,6 +29,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/effects/ogg/Undock.ogg:system/media/audio/ui/Undock.ogg \ $(LOCAL_PATH)/effects/ogg/Lock.ogg:system/media/audio/ui/Lock.ogg \ $(LOCAL_PATH)/effects/ogg/Unlock.ogg:system/media/audio/ui/Unlock.ogg \ + $(LOCAL_PATH)/effects/ogg/WirelessChargingStarted.ogg:system/media/audio/ui/WirelessChargingStarted.ogg \ $(LOCAL_PATH)/notifications/ogg/Adara.ogg:system/media/audio/notifications/Adara.ogg \ $(LOCAL_PATH)/notifications/ogg/Alya.ogg:system/media/audio/notifications/Alya.ogg \ $(LOCAL_PATH)/notifications/ogg/Arcturus.ogg:system/media/audio/notifications/Arcturus.ogg \ diff --git a/data/sounds/effects/ogg/LowBattery.ogg b/data/sounds/effects/ogg/LowBattery.ogg Binary files differindex 710e385..ab9eba3 100644 --- a/data/sounds/effects/ogg/LowBattery.ogg +++ b/data/sounds/effects/ogg/LowBattery.ogg diff --git a/data/sounds/effects/ogg/WirelessChargingStarted.ogg b/data/sounds/effects/ogg/WirelessChargingStarted.ogg Binary files differnew file mode 100644 index 0000000..66f6cd2 --- /dev/null +++ b/data/sounds/effects/ogg/WirelessChargingStarted.ogg |