Bug 863660 - Add pref to enable/disable SimplePush WebSocket. r=dougt

This pref should be used in UX to enable/disable push notifications
when the user wants to conserve battery life or save data usage.

--HG--
extra : rebase_source : a75b089082a4d44170890cae228c62114633f790
Bug 879821 - NFC B2G IPC Implementation Using UnixSockets; r=qdot
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/ff5a8ffa3017
Author: Dale  Harvey <dale@arandomurl.com>
Desc: Merge pull request #10405 from daleharvey/882175

Bug 882175 - Fix cellbroadcast settings UI to not display opposite of actual value. r=kaze

========

https://hg.mozilla.org/integration/gaia-central/rev/fe5e6a3e4d2e
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 882175 - Fix cellbroadcast settings UI to not display opposite of actual value
Merge m-c and birch.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/9f37d18ae352
Author: huchengtw-moz <johu@mozilla.com>
Desc: Merge pull request #10365 from huchengtw-moz/video/Bug_881474_spinner_shows_forever

Bug 881474 - [video] with youtube video paused, dragging slider makes sp..., r=@djf, a=leo+

========

https://hg.mozilla.org/integration/gaia-central/rev/4b036c915881
Author: John Hu <johu@mozilla.com>
Desc: Bug 881474 - [video] with youtube video paused, dragging slider makes spinner go forever.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/123a4b7418cf
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #10449 from alivedise/bugzilla/828965_master

Bug 828965 - Move permission screen z-index on lockscreen camera, r=timdream, a=leo+

========

https://hg.mozilla.org/integration/gaia-central/rev/b698acaadf03
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 828965 - Move permission screen z-index on lockscreen camera
Merge latest green birch changeset and mozilla-central