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

resolved conflicts for merge of cbc479c3 to master

Browse Source 
Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559
This commit is contained in:
Jean-Baptiste Queru
2010-10-24 14:02:10 -07:00
parent 5002433ba8 cbc479c3a6
commit bbd03141b4
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/product/full_base.mk
View File

@@ -29,7 +29,9 @@ PRODUCT_PACKAGES := \
# Additional settings used in all AOSP builds # Additional settings used in all AOSP builds
PRODUCT_PROPERTY_OVERRIDES := \ PRODUCT_PROPERTY_OVERRIDES := \
ro.com.android.dateformat=MM-dd-yyyy ro.com.android.dateformat=MM-dd-yyyy \
ro.config.ringtone=Ring_Synth_04.ogg \
ro.config.notification_sound=pixiedust.ogg
# 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