resolved conflicts for merge of 8928ef8b to master

Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e
2010-10-22 12:29:10 -07:00
parent 6c75cb3752 8928ef8b4c
commit 09fa73b3c3
1 changed files with 3 additions and 0 deletions
--- a/target/product/full_no_telephony.mk
+++ b/target/product/full_no_telephony.mk
@@ -35,6 +35,9 @@ PRODUCT_PROPERTY_OVERRIDES := \
 PRODUCT_COPY_FILES := \
    development/data/etc/vold.conf:system/etc/vold.conf

+# Put en_US first in the list, so make it default.
+PRODUCT_LOCALES := en_US
+
 # Pick up some sounds.
 $(call inherit-product, frameworks/base/data/sounds/AudioPackage4.mk)