summaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorTanguy Pruvot <tanguy.pruvot@gmail.com>2011-12-13 09:17:16 +0100
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2012-11-19 23:10:01 +0000
commitbc94b4c9e64602f20632beac2c6eb691db526fcc (patch)
tree5b410b979353443fbe8412cae2832dedb66f5774 /data
parent9a7debe5857ffc7c71cfc4082b1b6d72a5cf81cd (diff)
downloadframeworks_base-bc94b4c9e64602f20632beac2c6eb691db526fcc.zip
frameworks_base-bc94b4c9e64602f20632beac2c6eb691db526fcc.tar.gz
frameworks_base-bc94b4c9e64602f20632beac2c6eb691db526fcc.tar.bz2
AudioPackage5 contains duplicated bad-case filenames
Conflicts: data/sounds/AllAudio.mk Change-Id: Ie046a9faff5b1b71b6a09ec06aee679be909112a
Diffstat (limited to 'data')
-rw-r--r--data/sounds/AllAudio.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk
index e403205..bff308b 100644
--- a/data/sounds/AllAudio.mk
+++ b/data/sounds/AllAudio.mk
@@ -18,7 +18,7 @@ $(call inherit-product, frameworks/base/data/sounds/OriginalAudio.mk)
$(call inherit-product, frameworks/base/data/sounds/AudioPackage2.mk)
$(call inherit-product, frameworks/base/data/sounds/AudioPackage3.mk)
$(call inherit-product, frameworks/base/data/sounds/AudioPackage4.mk)
-$(call inherit-product, frameworks/base/data/sounds/AudioPackage5.mk)
+#$(call inherit-product, frameworks/base/data/sounds/AudioPackage5.mk)
$(call inherit-product, frameworks/base/data/sounds/AudioPackage6.mk)
$(call inherit-product, frameworks/base/data/sounds/AudioPackage7.mk)
$(call inherit-product, frameworks/base/data/sounds/AudioPackage7alt.mk)