Bug 1013433 - complete the packaged app update process; r=mfinkle,marco
Bug 1021770 - Browser Toolbox: remove extra separator next to options cog. r=jryans
Merge m-c to fx-team. a=merge
Bug 1021443 - java.lang.IllegalStateException: Already registered Webapps:Postinstall under a different type. r=jchen
Bug 1004319 - Handle server-side account changes in Gecko. r=jedp
Bug 1020379 - [RTSP] Fix potential infinite loop in ARTPConnection.cpp. r=sworkman
Bug 1020379 - [RTSP] Fix trivial compile warnings. r=sworkman
Bug 1020497 - collapse exposureCompensation to single attribute, r=bz
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f78c00034d8a
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #20143 from millermedeiros/1019617-week-view-am-pm

Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/b88e19c9c9ae
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/92e8d5e4f37c
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1021279 - Add a couple more wallpapers to fill the awkward gap in the selection screen r=me
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/13a57722bfd5
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #19889 from eeejay/bug-1019139

Bug 1019139 - Make switch element inline-block. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/76dcefcbbdae
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1019139 - Make switch element inline-block.
Bumping manifests a=b2g-bump
Merge m-c to b2g-inbound. a=merge
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a4e53e1001f2
Author: Marshall Culpepper <marshall.law@gmail.com>
Desc: Merge pull request #20106 from marshall/bug995434_ftuPingSimLocked_master

Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info

========

https://hg.mozilla.org/integration/gaia-central/rev/b46ac200fb89
Author: Marshall Culpepper <marshall@mozilla.com>
Desc: Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/fc307ae1c820
Author: gitmai <mri@tid.es>
Desc: Merge pull request #19628 from gitmai/bug-1007588-CC-iac-with-sms

Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other app...
r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/5b43cbc7469c
Author: mai <mri@tid.es>
Desc: Bug 1007588 -[Cost Control] Implement an IAC mechanism to warn other applications about sending a SMS for requiring balance or making a SMS top-up
Bumping manifests a=b2g-bump
Backed out changeset f4f3b1e4a0e5 (bug 1020497) for b2g debug emulator mochitest-1 failures
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/fb78b6585e31
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #20153 from millermedeiros/event-detail-963394

Bug 963394 - Visual refresh for event detail page r=gaye

========

https://hg.mozilla.org/integration/gaia-central/rev/6b1c35454e93
Author: Evan Xd <itoyxd@gmail.com>
Desc: Bug 963394 - Visual refresh for event detail page