mozilla-inbound: changeset 113419:5935517adf4d8a866f8752787b46a9c1684589d5

author	Jonathan Kew <jkew@mozilla.com>
	Thu, 15 Nov 2012 14:42:48 -0800
changeset 113419	5935517adf4d8a866f8752787b46a9c1684589d5
parent 113418	b88cc468573471024fa4404004ace9a83613e7a0
child 113420	2ed2255f26ada942ac7fd22608f804aacfb98bac
push id	18144
push user	jkew@mozilla.com
push date	Thu, 15 Nov 2012 22:43:27 +0000
treeherder	mozilla-inbound@5935517adf4d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	blassey
bugs	811201
milestone	19.0a1
first release with	nightly linux32 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly linux64 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly mac 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly win32 9a6d708faf3f / 19.0a1 / 20121117030747 / files nightly win64 9a6d708faf3f / 19.0a1 / 20121117030747 / files
last release without	nightly linux32 a761bfc192b5 / 19.0a1 / 20121115030705 / files nightly linux64 a761bfc192b5 / 19.0a1 / 20121115030705 / files nightly mac a761bfc192b5 / 19.0a1 / 20121115030705 / files nightly win32 a761bfc192b5 / 19.0a1 / 20121115030705 / files nightly win64 a761bfc192b5 / 19.0a1 / 20121115030705 / files

--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -3022,20 +3022,20 @@ pref("font.name.monospace.el", "Droid Sa
 pref("font.name-list.sans-serif.el", "Roboto, Droid Sans");
 
 pref("font.name.serif.he", "Droid Serif");
 pref("font.name.sans-serif.he", "Droid Sans");
 pref("font.name.monospace.he", "Droid Sans Mono");
 pref("font.name-list.sans-serif.he", "Droid Sans Hebrew, Droid Sans");
 
 pref("font.name.serif.ja", "Droid Serif");
-pref("font.name.sans-serif.ja", "Droid Sans Japanese");
+pref("font.name.sans-serif.ja", "Droid Sans");
 pref("font.name.monospace.ja", "MotoyaLMaru");
-pref("font.name-list.sans-serif.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
-pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar");
+pref("font.name-list.sans-serif.ja", "Roboto, Droid Sans, MotoyaLMaru, MotoyaLCedar, Droid Sans Japanese");
+pref("font.name-list.monospace.ja", "MotoyaLMaru, MotoyaLCedar, Droid Sans Mono");
 
 pref("font.name.serif.ko", "Droid Serif");
 pref("font.name.sans-serif.ko", "Droid Sans");
 pref("font.name.monospace.ko", "Droid Sans Mono");
 
 pref("font.name.serif.th", "Droid Serif");
 pref("font.name.sans-serif.th", "Droid Sans");
 pref("font.name.monospace.th", "Droid Sans Mono");