resolved conflicts for merge of cd3bd740
to master
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
This commit is contained in:
commit
5002433ba8
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue