resolved conflicts for merge of cbc479c3 to master

Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559

diff --cc target/product/full_base.mk
index 625b894,fb9b528..9ad45a9
--- 1/target/product/full_base.mk
--- 2/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@@ -29,9 -28,13 +29,11 @@@ PRODUCT_PACKAGES := 
  
  # Additional settings used in all AOSP builds
  PRODUCT_PROPERTY_OVERRIDES := \
-     ro.com.android.dateformat=MM-dd-yyyy
 -    keyguard.no_require_sim=true \
+     ro.com.android.dateformat=MM-dd-yyyy \
 -    ro.com.android.dataroaming=true \
+     ro.config.ringtone=Ring_Synth_04.ogg \
+     ro.config.notification_sound=pixiedust.ogg
  
 -# Put en_US first in the list, to make it default.
 +# Put en_US first in the list, so make it default.
  PRODUCT_LOCALES := en_US
  
  # Get some sounds