Bug 951975 - Expose Editor.setOption and Editor.getOption. r=msucan
Bug 957160 - DevTools Themes: Use 2x icon for split console on tab bar - part 2;r=pbrosset
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8b606885dc7e
Author: punamdahiya <punamdahiya@yahoo.com>
Desc: Merge pull request #14781 from punamdahiya/Bug924170_Video_Tests

Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike

========

https://hg.mozilla.org/integration/gaia-central/rev/342f8156903a
Author: Punam Dahiya <punamdahiya@yahoo.com>
Desc: Bug924170 - [Video] - Add Marionette tests for Video App r=jugglinmike
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9960daf91c38
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #15077 from gaye/bug-952762

Bug 952762 - Reenable email reply tests

========

https://hg.mozilla.org/integration/gaia-central/rev/6eaeb5d63c86
Author: Gareth Aye <gaye@mozilla.com>
Desc: Bug 952762 - Reenable email reply tests
Merge inbound to m-c
Merge b2g-inbound to m-c
Merge fx-team to m-c
Merge m-c to inbound