Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/7eefa9a00861
Author: Salvador de la Puente González <salva@unoyunodiez.com>
Desc: Merge pull request #22483 from lodr/bug-1048201-fix-typo-preventing-stk-command

Bug 1048201 - [System] STK Command for choosing an option is not working on v2.0
r=frsela
r=alive

========

https://hg.mozilla.org/integration/gaia-2_0/rev/67a25063deee
Author: Salvador de la Puente <salva@unoyunodiez.com>
Desc: Bug 1048201 - [System] STK Command for choosing an option is not working on v2.0
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/342105bd6a5a
Author: EragonJ <eragonj@eragonj.me>
Desc: Merge pull request #22458 from EragonJ/v2.0-bug-1034560

Bug 1034560 - Utility tray is closed when the airplanemode button is pressed

========

https://hg.mozilla.org/integration/gaia-2_0/rev/049bf921ed95
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1034560 - Utility tray is closed when the airplanemode button is

pressed
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/25d5f92a1868
Author: Zac <zcampbell@mozilla.com>
Desc: Bug 1043293 - Follow up with test changes to address non-functional Travis failures
Bumping manifests a=b2g-bump
Bug 1042771 - Fix TextureClientPool::ReturnDeferredClients(). r=nical, a=2.0+
Bug 1037666. r=billm, a=abillings
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/798be87c6457
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22314 from KevinGrandon/bug_1046158_homescreen_settings_cleanup

Bug 1046158 - [Settings] Revert logic for column display detection
Conflicts:
	apps/settings/elements/homescreen.html

========

https://hg.mozilla.org/integration/gaia-2_0/rev/3e8462d22c90
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #22313 from KevinGrandon/bug_1046158_homescreen_columns

Bug 1046158 - [Vertical Homescreens] Use three columns by default everywhere

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f1588d69cb56
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1044316 - Dont assume uppercase .nodeName. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-2_0/rev/05dbc4b59f32
Author: Fernando Campo <fcampo@users.noreply.github.com>
Desc: Merge pull request #22438 from fcampo/fte-time-choose-1042388

Bug 1042388 - [FTU] Changes to Region/City selectors are not displayed onscreen (r=francisco)
Conflicts:
	apps/ftu/js/app.js
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/9303cf41a0a5
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1045701 - Part 2 [Homescreen] - Do not migrated un-initialized smart collections r=amirn

========

https://hg.mozilla.org/integration/gaia-2_0/rev/3dce606eb5db
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Bug 1042388 - Add back line that was accidentally removed when rebasing. a=bustage
Bumping manifests a=b2g-bump
Merge mozilla-beta to b2g32. a=merge
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/214726a46d98
Author: Hubert Figuière <hub@figuiere.net>
Desc: Merge pull request #22524 from hfiguiere/v2.0

Bug 1033402 - Wait for the available marionette socket. a=test-only r=kgrandon

========

https://hg.mozilla.org/integration/gaia-2_0/rev/dfd9f4bb18ef
Author: Hubert Figuière <hub@figuiere.net>
Desc: Bug 1033402 - Wait for the available marionette socket. a=test-only

Also part of bug 1027232
Bumping manifests a=b2g-bump
Bug 1042791 - H.264 profile-level-id's in SDP have no leading '0x', breaking interop. r=ehugg, a=2.0+

--HG--
extra : rebase_source : 4d7808dbba9349df73bfa265d4ce1f14797c0695
Bug 1042791 - Add case insensitive and activated test. r=jesup, a=test-only

--HG--
extra : rebase_source : 61fccea523959a973c03b948b6c03a9ef3b33fac
Bug 1043515 - Add max-br and max-mbps H.264 SDP fmtp parameters; update supported h264 level. r=ehugg, a=2.0+

--HG--
extra : rebase_source : 64e6b81c9352ad203fc4d1f7781e9a6a7ceecb96
Bug 1043515 - Ignore unknown fmtp values; partially fix unittests to handle H264_P0 disabled. r=ehugg, a=2.0+

--HG--
extra : rebase_source : 8e6222d7decaa7fdc97d974de58f1864c7404bb3
Bug 1043515 - Add support for a preferred codec to be chosen/offered first always. r=ehugg, a=2.0+

--HG--
extra : rebase_source : d23a94dc853678d970b832335c172ef1c6497b7d