Merge inbound to m-c. a=merge
Backed out changesets a68c9d18ffa5 and 750e7aaf09cb (bug 1067414) for causing bug 1068658. a=me
Merge m-c to b2g-inbound. a=merge
Bug 1068388 - Part 1: Clarify that Stumbler pref is Android-only. r=nalexander, r=garvank
Bug 1068388 - Part 2: Remove the use of app.geo.reportdata from gecko. r=rnewman
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/be9a28d6fb25
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #24118 from zbraniecki/1048411-remove-inline-locales

Bug 1048411 - Remove GAIA_INLINE_LOCALES optimization. r=stas

========

https://hg.mozilla.org/integration/gaia-central/rev/6235c489c597
Author: Zbigniew Braniecki <gandalf@mozilla.com>
Desc: Bug 1048411 - Remove GAIA_INLINE_LOCALES optimization. r=stas

========

https://hg.mozilla.org/integration/gaia-central/rev/fef7f4b23c21
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #20619 from gmarty/Bug-1007948-no-multiple-calls"

This reverts commit 8ccac0744848bd3ceaa6aa1c972ae0eb1e9ddc1e, reversing
changes made to c2c92e7be95dd0b65ee44113e1d17592dd0e20c6.
Bug 1068388 - Part 3: Hide stumbler settings items if stumbler isn't built. r=garvank
Bug 1068388 - Part 4: Update UI pref key value for app.geo.reportdata. r=rnewman
Bumping manifests a=b2g-bump
Bug 1064433 - Remove old unused webgl conformance mochitest files. - r=kamidphish
Follow up for back out of bug 1047603, disable browser_social_flyout.js test that's failing in e10s. a=RyanVM CLOSED TREE
Merge m-c to b2g-inbound on a CLOSED TREE.
Bug 1068020 - Fix more bad implicit constructors in DOM; r=baku
Bug 1068022 - Fix more bad implicit constructors in gfx; r=jrmuizel
Bug 1068195 - Fix an invalid MOZ_ASSERT in moz2d code, asserting the value of a constant string pointer; r=jrmuizel
Bug 1068193 - Use the correct return type for Factory::CreateWrappingDataSourceSurface; r=jrmuizel
Bug 1067340 - Don't use nsIDOMWindowUtils in the CSP code, because it's not meant to be used from C++; r=geekboy
Bug 1068613 - Addendum: Fix bustage in ASAN builds. r=bustage on a CLOSED TREE
Bug 1067340 follow-up: null check the inner window r=bustage

Landed on a CLOSED TREE
Bug 1068613 - Addendum 2: Fix bustage due to stray character. r=bustage on a CLOSED TREE