bug 831354 - Ship [but don't actually use] fonts (Open Sans and Charis SIL Compact) for content in Firefox for Android. r=mfinkle,blassey
Bug 831725 - Fix wrong merge on toolkit/components/places/tests/browser/head.js
r=me