Bug 959061 followup: remove else after return
merge m-c to fx-team
Bug 969719 - get rid of level='top' workaround for Australis standalone panels, r=MattN
Bug 967220 - Australis - include the tabstoolbar in things animating (with a margin), r=mconley
Bug 966905 - [Australis] Headers and footers of subviews should be outside scrollable bits of those panels/subviews. r=Gijs
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/775dadf70f86
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16084 from flodolo/bug969193_okcostcontrol

Bug 969193 - [Cost Control] The string "Ok" is not localizable when launching cost control with a locked SIM

========

https://hg.mozilla.org/integration/gaia-central/rev/84aad960d6eb
Author: Francesco Lodolo (:flod) <flod@lodolo.net>
Desc: Bug 969193 - ][Cost Control] The string "OK" is not localizable when launching cost control with a locked SIM

Button is using a non existent string ID. Existing string with id “ok”
seems to be unused in other contexts.

========

https://hg.mozilla.org/integration/gaia-central/rev/1f9ad26666f5
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16060 from svic/Bug_960473

Bug 960473 : Fix ReadNdef Issue when using Connect()

========

https://hg.mozilla.org/integration/gaia-central/rev/e2f242561a8e
Author: Siddartha Pothapragada <Siddartha.Pothapragada@telekom.com>
Desc: Bug 960473 : Fix ReadNdef Issue when using Connect()
Bug 665319 - Add a checkbox to activate network.proxy.socks_remote_dns. r=ttaubert, ui-r=philipp
Bug 957072 - Add Pretty Print to Scratchpad Menu. r=robcee
Bug 965023 - Use Object.freeze on exports of Home.jsm. r=mcomella
Bug 966894 - Use U+2026 for ellipsis in netmonitor.properties. r=vporof
Bug 969804 - Use U+2026 for ellipsis in loadingSourcesText (debugger.properties). r=vporof
Bumping manifests a=b2g-bump
Merge m-c to f-t
Merge m-c to b-i
Bug 956474 - Enforce that keywords in expressions are recognized; r=wlach
No bug - Stop building PluginDocument.cpp in unified mode.
It pulls in system headers that conflict with the new code in
HTMLAllCollection.cpp.
Bug 968766 - Part a: Move the custom HTMLAllCollection code from nsDOMClassInfo.cpp to HTMLAllCollection.cpp; r=jst
Bug 968766 - Part b: Store the document.all NodeList in a C++ member rather than a reserved slot; r=jst
Bug 968766 - Part c: Remove nsHTMLDocumentSH::GetDocumentAllNodeList; r=jst
Bug 968766 - Part d: Introduce HTMLAllCollection::Length; r=jst