Bug 862763: Cache whether font size inflation is enabled in the pres shell for efficiency. [r=dbaron]
Bug 862763, Followup 1: Make MaybeReflowForInflationScreenWidthChange trigger a reflow when font inflation prefs change in either direction. [r=dbaron]
Bug 763879 - implement inline stylesheet blocking for CSP (r=dbaron)
Bug 868806 - Handle OMXCodec's error. r=doublec
Bug 871853 - runapp.js: Don't call Services.obs.removeObserver with undefined. r=fabrice
Bug 872146 - Remove obsolete files. r=mdas
Bug 872852 - Turn on contacts mochitests on b2g. r=reuben
Bug 849725: remove RIL.iccInfoPrivate.SPN.spn. r=allstars.chh
Bug 872428 - Fix missing setForceUse to BT SCO for audio path, r=mwu
Bug 871905 - Fix build error on android platform. r=vicamo
Merge m-c to birch.
Bug 868932 - All channel volume is not updated. r=mwu
Bug 860546 - Ignore content changes caused by key events. r=fabrice
Bug 842657 - Flip the pref to enable the CSP 1.0 parser for Firefox (r=jst)
Backed out 2 changesets (bug 763879, bug 842657) for landing with an r-. DONTBUILD

Backed out changeset 254c1ac4ab8b (bug 842657)
Backed out changeset 58a2011beeac (bug 763879)
Bug 873038 - Remove the old MSVC PGO exclusions across the tree; r=glandium
Merge m-c to inbound.
Bug 872292 - Update progress bar styling. r=mbrubeck
Bug 868217 - Hide sync flyout description when sync is setup properly. r=ally
Bug 872893 - Make EmitElemOp static. r=bhackett

--HG--
extra : rebase_source : ef256ee76e7d08e9a9b1ebfcd5f4b2cdd126c546