Bug 929887 - Make the Network Monitor use CodeMirror. r=vporof
Backed out changeset cfd30965638a (bug 906839)
Backed out changeset 6c3eb5fd4ade (bug 906839)
Backed out changeset 9eaf00ec189a (bug 906839) on suspicion of increasing the failure rate of browser_frameworker.js
Bug 895561 - 'Edit As HTML' option in the markup view - toolkit changes, r=fitzgen
Bug 895561 - 'Edit As HTML' option in the markup view - browser changes, r=jwalker
Bug 928144 - Make Manifest Editor read-only for hosted apps. r=paul

--HG--
extra : rebase_source : 66b5c3aaab33ba714e4740bbf54d20ffa40e2132
Bug 932127 - correctly configure ctypes in cross compilation conditions; r=glandium

Just unconditionally export things for Android and everything else.
Bug 915311 - Improve MOZ_HOST_BIN warnings; r=ted
Bug 933502 - Make memory reporter mochitests work with ASAN.  r=gps,me.

--HG--
extra : rebase_source : 325ee35d47aa38d1cc28008f449fce5fb3a658fc
Bug 917496 - Disable GPUAdapterReporter because its values are frequently bogus.  r=Hughman.

--HG--
extra : rebase_source : ae3bbbc142dfcf7101aaac94acc52e67e68e97fd
Bug 929797 - Implement proper memory reporting for child processes.  r=khuey.

--HG--
extra : rebase_source : f0788757afc2097830295170120e1e2094993cc7
Bug 933207 - B2G SMS & MMS: Fire system messages for the delivery reports. r=ctai
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/4cff2039128e
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13188 from AndreiH/bug932250

Bug 932250 - Write a test for context menu activity picker

========

https://hg.mozilla.org/integration/gaia-central/rev/a90bdecc808d
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 932250 - Write a test for context menu activity picker

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/ui_tests/app.py
Bug 887159 - B2G SMS: Handle message delivered timestamp for delivery report (part 1, DOM IDL). sr=hsinyi
Bug 887159 - B2G SMS: Handle message delivered timestamp for delivery report (part 2, implementation and tests). r=vicamo
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9e33e5cbf4c0
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #12863 from tomleese/bug890225

Bug 890225 - Made "Clear All" not visible when there are no notifications, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/a19da7fdc78b
Author: Tom Leese <leese.thomas81@gmail.com>
Desc: Bug 890225 - Made "Clear All" not visible when there are no notifications
Bug 915570 - Rename 'keyboard' permission and role to 'input'. r=yxl
Merge mozilla-central and b2g-inbound
Bumping gaia.json for 3 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/30de318e162e
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #12885 from crh0716/912020

Bug 912020 - Save to settings DB when leaving the panel r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/d3dd79fc9fdb
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 912020 - Save to settings DB when leaving the panel

========

https://hg.mozilla.org/integration/gaia-central/rev/908ee9488b2a
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 932795 - remove unused systemXHR permission. r=daleharvey