StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of cd3bd740 to master

Browse Source 
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
This commit is contained in:
Jean-Baptiste Queru
2010-10-24 06:08:24 -07:00
parent dd15bec71f cd3bd7402f
commit 5002433ba8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/full_base.mk
View File

@@ -34,8 +34,8 @@ PRODUCT_PROPERTY_OVERRIDES := \
# Put en_US first in the list, so make it default. # Put en_US first in the list, so make it default.
PRODUCT_LOCALES := en_US PRODUCT_LOCALES := en_US
# Pick up some sounds. # Get some sounds
$(call inherit-product-if-exists, frameworks/base/data/sounds/AudioPackage4.mk) $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk)
# Get the TTS language packs # Get the TTS language packs
$(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) $(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk)