Merge m-c to b-i.
Bug 946942 - Update APN settings on start if MMS call is already connected. r=gene
Merge b2g-inbound to m-c.
Merge fx-team to m-c.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/acba8a7d5451
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14473 from davidflanagan/bug945376

Bug 945376: correctly handle the None alert tone setting r=pdahiya

========

https://hg.mozilla.org/integration/gaia-central/rev/e416cc78aeea
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 945376: correctly handle the None alert tone setting
Bug 863872 - If we have overdue TelemetryPings, try to send them all. r=nfroyd, feedback=irving.
Bug 946269: Rename nsFlexContainerFrame::ComputeFlexContainerCrossSize to ComputeCrossSize. implicit-rs=mats
Bug 945349 - CertVerifier should check early for bad usages. r=briansmith
Bug 904227 - Print ? if we don't have a test object. r=bjacob

--HG--
extra : rebase_source : cc1571123f7414f7a64a620aeebd1ce4b5002a9e
Bustage followup to bug 767343 in non-unified builds
On a CLOSED TREE.

--HG--
extra : amend_source : 509032affaebf78b8a0430f2ba8e214639cdcdd1
Bug 941766 - Fix an exact rooting hazard in NPAPI; r=johns

--HG--
extra : rebase_source : f82a0e94f689ce0c5b88e05d9ae56ef52ce2f662
Backed out changeset 328d23950f63 (bug 942650)
Merge mozilla-central into holly
Backed out changeset 32817c0e869e (bug 946181)
Backed out changeset 8cc62acf53a5 (bug 944781)
Backed out changeset 2fd38af5d110 (bug 946148)
Backed out changeset ff935cad9804 (bug 942853)
Backed out changeset f6b76649e96a (bug 940251)
Merge mozilla-central into holly
Merge mozilla-central into holly