commit bbd03141b4903eda49deb0937a2174ed09f56aa4
author Jean-Baptiste Queru <jbq@google.com> Sun Oct 24 14:02:10 2010 -0700
committer Jean-Baptiste Queru <jbq@google.com> Sun Oct 24 14:02:10 2010 -0700
tree 4bf5a2505fb1d1a120dd94a4ce4453ea159dd104
parent 5002433ba8c12bc7f373e402bf69fea8f1dfed76
parent cbc479c3a64e054ae2c6945cdad14fd0ef789497

resolved conflicts for merge of cbc479c3 to master

Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559

target/product/full_base.mk

diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index 625b894..9ad45a9 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -29,7 +29,9 @@
 
 # Additional settings used in all AOSP builds
 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.
 PRODUCT_LOCALES := en_US