Bug 981097: Test introductionScript when the introducer and introduced are in different globals. r=sfink
bug 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle
Merge m-c to inbound.
Bug 980679 - Filter redundant scroll offset updates by scroll generation value. r=botond
bug 899319 - use __is_base_of() on gcc / clang / msvc r=froydnj
Bug 981132 - set up atfork on the main thread. r=bgirard

--HG--
extra : rebase_source : adbbf08a081dac84de6e1c2d001f32c786b38dc5
Bug 981126 - Prevent glxtest child process from executing the normal shutdown sequence. r=bgirard, r=jrmuizel

--HG--
extra : rebase_source : b28d660a9959895f743515f64381e4a5e0bb2c74
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0c0dfba36634
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #17161 from pivanov/bug-968483

Bug 968483 - [Building Blocks] Update header design to accommodate larger back-button

========

https://hg.mozilla.org/integration/gaia-central/rev/307079877934
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 968483 - [Building Blocks] Update header design to accommodate larger back-button
Bumping manifests a=b2g-bump
Merge m-c to b2g-inbound.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/04a13c212e02
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #17139 from julienw/947139-send-default-sim

Bug 947139 - [DSDS][Message] Send message via default SIM r=schung

========

https://hg.mozilla.org/integration/gaia-central/rev/baf554253a9e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 947139 - [DSDS][Message] Send message via default SIM r=francisco

This refactors the sendSMS and sendMMS methods in MessageManager, and passes the
serviceId all the way from the UI to the API.

This also styles the composer for DSDS configurations, and display the correct
SIM inside the button.
Bumping manifests a=b2g-bump
Bug 894933 - Cancel dangling compositor tasks. r=jrmuizel
Bug 983272 - Add a default tiling pref for desktop. r=Cwiiis
Bug 982906 - No free lunches! r=bzbarsky
Merge inbound to m-c
Merge fx-team to m-c
Merge m-c to fx-team