diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-24 05:29:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-24 05:29:10 -0700 |
| commit | 045002e0fc9cf0f77589a777f202dc70a7038b44 (patch) | |
| tree | d12ea7627384ddda12ea3fc06bd35faea8bf237e /data | |
| parent | 9c937f3687968e1a07f2e061fca1ad64fa106c04 (diff) | |
| parent | c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22 (diff) | |
| download | frameworks_base-045002e0fc9cf0f77589a777f202dc70a7038b44.zip frameworks_base-045002e0fc9cf0f77589a777f202dc70a7038b44.tar.gz frameworks_base-045002e0fc9cf0f77589a777f202dc70a7038b44.tar.bz2 | |
am c6d813b0: Merge "Introduce a list of all the audio files" into gingerbread-plus-aosp
Merge commit 'c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22'
* commit 'c6d813b0c5c21ab4e8ff920d181c5a29b7bb9f22':
Introduce a list of all the audio files
Diffstat (limited to 'data')
| -rw-r--r-- | data/sounds/AllAudio.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/data/sounds/AllAudio.mk b/data/sounds/AllAudio.mk new file mode 100644 index 0000000..4e7a403 --- /dev/null +++ b/data/sounds/AllAudio.mk @@ -0,0 +1,20 @@ +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +$(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) |