Bumping manifests a=b2g-bump
merge fx-team to mozilla-central
merge b2g-inbound  to mozilla-central
Merge m-c to b2g-inbound
Bug 996452 - [NFC] Add emulator rf_discover test case. r=tzimmermann
Bug 990725 - Rename ErrorEvent.column to .colno to match spec change; r=smaug
Bug 998898 - Fix webconsole exception on simulator. r=jryans
Bug 998426 - Ensure shrunken toolbar consistency across API levels. r=wesj
Bug 997131 - Simplify conditional forward button CSS by making the forward button a direct sibling of the location bar. r=mdeboer

--HG--
extra : rebase_source : e9c7c70d5295564dc61766fdaf1eec620e90d77a
Bug 983681 - Show some content in the downloads panel when it is empty. r=mak
Bug 976335 - Handle about:home tab strip overflow on tablets. r=lucasr
* * *
Bug 976335 - (Part 1) Turn TabMenuStrip into a HorizontalScrollView, moving LinearLayout logic to TabMenuStripLayout. r=lucasr
* * *
Bug 976335 - (Part 1.5) Remove m prefixes from TabMenuStripLayout. r=lucasr
* * *
Bug 976335 - (Part 2) Scroll tab strip to ensure selected tab is visible. r=lucasr
Bug 994284 - Intermittient testSystemPages | Exception caught - junit.framework.AssertionFailedError: LayerView is not found! r=gbrown
Bug 999443 - Trying to reuse the same nsISimpleEnumerator for multiple plugins means that only the first plugin in an extension is marked as being in an extension. Cache the list in an array instead. r=gfritzsche

--HG--
extra : rebase_source : edaf8dcb026b2e1b8c31ff59022201120c3d2e4a
Bug 999443 test - The first plugin found in extensions was activated, but any subsequent plugins were not. r=gfritzsche

--HG--
extra : rebase_source : 05c89bce40ab4a29f092108fb7833138c3adf337
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ecba19bc11ba
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #18296 from mcav/email-toolbar

Bug 993215 - [Email] toolbar covers the bottom line of long emails. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/65688ff1da8d
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 993215 - [Email] toolbar covers the bottom line of long emails. r=jrburke

========

https://hg.mozilla.org/integration/gaia-central/rev/3f5bec387bfe
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #18347 from mcav/acctsslice

Bug 966323 - [B2G] Email account unrecognizable when sharing a link from... r=asuth

========

https://hg.mozilla.org/integration/gaia-central/rev/87ed1ee2fb9e
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 966323 - [B2G] Email account unrecognizable when sharing a link from the browser.
Bug 994734 - Rename PanelManager to PanelInfoManager (r=margaret)

--HG--
rename : mobile/android/base/home/PanelManager.java => mobile/android/base/home/PanelInfoManager.java
Bug 994734 - Rename HomeConfigInvalidator to HomePanelsManager (r=margaret)

--HG--
rename : mobile/android/base/home/HomeConfigInvalidator.java => mobile/android/base/home/HomePanelsManager.java
Bug 994734 - Pass dataset id as query argument in HomeProvider (r=margaret)
Bug 994734 - Set cursor notification URI in HomeProvider (r=margaret)
Bug 994734 - Handle dataset refreshes in HomePanelsManager (r=margaret)