diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-24 06:08:24 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-24 06:08:24 -0700 |
| commit | 5002433ba8c12bc7f373e402bf69fea8f1dfed76 (patch) | |
| tree | 0aa105ee9750beddc81b074a16252893609e2a1b /target | |
| parent | dd15bec71f23ad3364c4ae62fc47213dc976e861 (diff) | |
| parent | cd3bd7402f64873ea8dc23d5a6c53b1733373347 (diff) | |
| download | build-5002433ba8c12bc7f373e402bf69fea8f1dfed76.zip build-5002433ba8c12bc7f373e402bf69fea8f1dfed76.tar.gz build-5002433ba8c12bc7f373e402bf69fea8f1dfed76.tar.bz2 | |
resolved conflicts for merge of cd3bd740 to master
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
Diffstat (limited to 'target')
| -rw-r--r-- | target/product/full_base.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/product/full_base.mk b/target/product/full_base.mk index dbbd0cc..625b894 100644 --- a/target/product/full_base.mk +++ b/target/product/full_base.mk @@ -34,8 +34,8 @@ PRODUCT_PROPERTY_OVERRIDES := \ # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US -# Pick up some sounds. -$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage4.mk) +# Get some sounds +$(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) # Get the TTS language packs $(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) |