Bug 1054624 - Fix high-packet-loss problems with H.264 WebRTC calls. r=jesup, a=lmandel
Bug 1056919 - Crash in memcpy | mozilla::net::CacheFileChunk::OnDataRead(mozilla::net::CacheFileHandle*, char*, tag_nsresult). r=honzab, a=sledru
Bug 1055319 - Add DNS-based soft-start mechanism for Loop in release builds. r=dolske, a=lmandel
Bug 1057137 - Broken menu: NS_ERROR_ILLEGAL_VALUE: id, attribute, or value too long. r=enn, a=lmandel
Bug 1061414 - Fix VisualFrameWarning logic. r=milan, a=lmandel
Bug 1021972 - csp attribute in manifest doesnt actually apply a CSP. r=ochameau, a=bajaj
Bumping gaia.json for 13 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/09b8155db346
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1064256 - [Contacts] "TypeError: iceGroup is null" v2.1

========

https://hg.mozilla.org/integration/gaia-2_1/rev/e7c70c42f69d
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Revert "Bug 1064256 - [Contacts] "TypeError: iceGroup is null""

This reverts commit d6e06fc7378c3d25618b0e1f99715a96fa290f61.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/40aae6766c0e
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24108 from yzen/bug-1030346

Bug 1030346 - several improvements to Contacts accessibility.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/242ac8c7edaa
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1030346 - updated labels, aria labels and their aria-visibility.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/75603eebde04
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1030346 - fixed checkbox roles, state and aria markup.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/85c5e8d25ea9
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1030346 - fixed listbox dropdown roles and aria markup.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/fb954d5a1df2
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1030346 - fixed list, listbox and false list roles.

Conflicts:
	apps/communications/contacts/elements/details.html
	apps/communications/contacts/elements/settings.html

========

https://hg.mozilla.org/integration/gaia-2_1/rev/763216980b66
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1030346 - make element order in markup consistent with the displayed order.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a4162dee612f
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1030346 - removed redundant role="menuitem" from header buttons. Button is more consistent with the rest of the UI when in screen reader mode.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/31ca26fbb0cf
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1062334 - Update ambient indicator colour

========

https://hg.mozilla.org/integration/gaia-2_1/rev/41011c553b1a
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1061421 - [Contacts] Delete all contacts which were set to ICE, 'ICE contacts' list is empty but the whole ICE section should be removed r=sergi

========

https://hg.mozilla.org/integration/gaia-2_1/rev/3104d59141ce
Author: Doug Sherk <github@sherk.me>
Desc: Bug 1060725 - Add missing tests to ICEContacts. r=Rik

========

https://hg.mozilla.org/integration/gaia-2_1/rev/1c02b2dd3630
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1064256 - [Contacts] "TypeError: iceGroup is null"
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/5c9f754f637c
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #20619 from gmarty/Bug-1007948-no-multiple-calls"

This reverts commit 8ccac0744848bd3ceaa6aa1c972ae0eb1e9ddc1e, reversing
changes made to c2c92e7be95dd0b65ee44113e1d17592dd0e20c6.
Bumping manifests a=b2g-bump
Bug 1065509: Bump maximum download size from 35 MB to 70 MB in stub installer. r=rstrong, a=lmandel
Bug 1041512 - Mark intrinsic widths dirty on a style change even if the frame hasn't had its first reflow yet. r=dbaron, a=abillings

--HG--
extra : rebase_source : 40ffbc4e965ae29652516bc517cc99fd093aa07c
Bug 1061684 - Normalize path separators in JAR paths. r=mshal, a=lmandel

The forward slash appears to be the standard path separator in zip/JAR
files. Accept back slashes when adding paths to a JAR.

--HG--
extra : rebase_source : ea004fa9d6aa89de694817b3aa6658a619e9dcd0
Bug 1064481 - URLSearchParams should encode % values correcty. r=ehsan, a=lmandel

--HG--
extra : rebase_source : 4b0f28cba1542964d7db67bf53cdf898e8e06268
Bug 1060103 - Add trickle ICE support for steeplechase. r=ted, a=lmandel

--HG--
extra : rebase_source : 7faf8bf9394bb5d853056b8e8a067024835b6947
Bumping gaia.json for 5 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/7157a0e8c07a
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #24117 from nullaus/bug1064975

bug 1064975 - Manually check evt.detail for evt.detail.filter instead of...

========

https://hg.mozilla.org/integration/gaia-2_1/rev/9cf44cd39368
Author: Ghislain 'Aus' Lacroix <aus@mozilla.com>
Desc: bug 1064975 - Manually check evt.detail for evt.detail.filter instead of short-hand assignment. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-2_1/rev/f8b1a0b41efa
Author: albertopq <apastor@mozilla.com>
Desc: Bug 1063305 - NFC icon disappear after reboot

========

https://hg.mozilla.org/integration/gaia-2_1/rev/fd1e701fef6f
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1063740 - Home screen is shown in landscape mode when canceling out of search app. r=kgrandon

========

https://hg.mozilla.org/integration/gaia-2_1/rev/32f552d5ca4b
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1060727 - [CMAS] Duplicated notifications in system tray when dismiss the attention screen by tapping on home button
Bumping manifests a=b2g-bump
Bumping gaia.json for 9 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/bc6fe32e98fd
Author: mai <mri@tid.es>
Desc: Bug 1061858 - [Cost Control][Usage app] Usage app disables Wifi tracking after exiting/launching Usage app

========

https://hg.mozilla.org/integration/gaia-2_1/rev/b54d1c26c1f1
Author: mai <mri@tid.es>
Desc: Bug 1061636 - Remove icons from the Cost Control widget FTU section

========

https://hg.mozilla.org/integration/gaia-2_1/rev/e6c7640dee2e
Author: Edgar Chen <echen@mozilla.com>
Desc: Bug 1062720 - [STK] Should carry the response in |isYesNo| for "Yes"/"No" request. r=frsela

========

https://hg.mozilla.org/integration/gaia-2_1/rev/75f68ab7e868
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1052256 - Block the click events before the first panel gets ready

========

https://hg.mozilla.org/integration/gaia-2_1/rev/efbc579b98af
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1065421 - Add theme color to clock

========

https://hg.mozilla.org/integration/gaia-2_1/rev/5dbaa02ce4cf
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1065167 - [email] The contents of the outbox won't show until any active sending process completes due to held mutex by sending process. r=asuth

========

https://hg.mozilla.org/integration/gaia-2_1/rev/e25ace93bce6
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 1063310 - [email] When sending multiple attachments, all but the first are sent as zero-byte attachments. r=asuth

========

https://hg.mozilla.org/integration/gaia-2_1/rev/2635890b84f8
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 1066045 - [v2.2][v2.1] Rapidly tapping record after switching from picture to camera mode will take photo instead of video

Conflicts:
	apps/camera/js/views/controls.js

========

https://hg.mozilla.org/integration/gaia-2_1/rev/3a9253d0e991
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side
Bumping manifests a=b2g-bump
Bug 1066362 - Move default privileged csp to all.js r=dveditz a=bajaj