Bug 946990 - Remember whether Metro or desktop Firefox was last used [r=bbondy]
Bug 944041 - Failure to make geckoview from m-c. r=khuey
Bug 947257 - Splitters have a dark squary sort of thing in their center. r=paul
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/7c86ea51249f
Author: John Ford <john@johnford.info>
Desc: Merge pull request #12111 from PinZhang/bug912317_add_speaker

Bug 912317: Add speaker switcher

========

https://hg.mozilla.org/integration/gaia-central/rev/165c032e0c47
Author: pzhang <pzhang@mozilla.com>
Desc: Bug 912317: Add speaker switcher
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/637037f23216
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #14381 from davidflanagan/bug927286

Bug 927286: Change keyboard word suggestions so we never display the use...

========

https://hg.mozilla.org/integration/gaia-central/rev/9c54a1f2a74b
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 927286: Change keyboard word suggestions so we never display the user's actual input and instead have an X icon to dismiss the suggestions and prevent autocorrection

address review comments

update tests to match new word suggestions behavior

fix merge conflict with bug 929361
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

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

Bug 939962: attempt to reduce memory requirements for saving an edited i...

========

https://hg.mozilla.org/integration/gaia-central/rev/02e03d210e37
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 939962: attempt to reduce memory requirements for saving an edited image
Bumping gaia.json for 1 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/961def304c06
Author: Eric O'Connor <eric@bocoup.com>
Desc: Bug 944271 - [OTA][Data Migration][Clock] The alarm events will...
   be lost after update from v1.1 to v1.2

Adds a routine to startup.js to convert old Alarm entries to the
new format.
Merge m-c to b-i.
Bug 946942 - Update APN settings on start if MMS call is already connected. r=gene
merge inbound to m-c
merge fx-team to m-c
merge m-c to inbound