Bug 1041511 - Fix navigations to private resources after landing bug 354493 r=mcmanus
Bug 1020445: Fixed Loop conversation layout on Google Chrome, r=dmose
Bug 1028580 - Improve code generated for conditional and &&/|| tests, r=jandem,sunfish.
Bug 1039031: Print name of server in TLS/OCSP tests, r=cviecco

--HG--
extra : rebase_source : 4d5ae2bdd920f29c6f820b6daf035ddb12406b12
Merge fx-team to m-c a=merge
Merge m-c to b2g-inbound
Bug 1026599 - PUSH WakeUp netid discover using the reserved 3gppnetwork.org domain. r=nsm
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8cd6c73ef832
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21172 from yurenju/multilocale-manifest

Bug 1007485 - manifest.webapp shoud not be localized in en-US if LOCALE_... r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/848f923d00cc
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1007485 - manifest.webapp shoud not be localized in en-US if LOCALE_BASEDIR/en-US exists
Bumping manifests a=b2g-bump
Back out f341384014d4, redness not trivially fixable.  r=bustage affecting a CLOSED TREE
Bug 1037686 - Fix b2g-only bustage for a super-old compiler, sigh.  r=b2g affecting a CLOSED TREE
Backed out changeset edbc72909115 (bug 1037100) for build bustage on a CLOSED TREE
Bug 1034240 - Trigger an update of the displayport margins on a new APZC if the content already has margins. r=botond
Bug 1040056 - Increment version of moztest required by marionette to include structured logging modification.;r=mdas
No bug. Drop expected number of b2g hazards to zero, r=terrence

DONTBUILD because mostly NPOTB

--HG--
extra : rebase_source : 06ca33d45445681ac8c2e32671d79409d76ca52e
Bug 753203 - Enable exact rooting by default in all configurations; r=sfink
Bug 1000131 - Expired Loop call url notification, r=dmose

--HG--
rename : browser/components/loop/standalone/content/js/webapp.js => browser/components/loop/standalone/content/js/webapp.jsx
Merge inbound to m-c a=merge
Bug 1015718 - Deserialize the DXGI handle when constructing the TextureHost rather than when locking it. r=nical a=tomcat
Bug 1034489 - [FirefoxOS_v1.4][Shark]Close WIFI while obtaining IP from AP and WIFI button can't be tapped for long. r=chulee