Bug 1053051 - Read MediaTime when checked in DecodeSeek. r=jwwang, a=bajaj
Backed out changeset 3819402e564a (bug 1053051) for mochitest failures.
Bumping gaia.json for 7 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/e8c68d5acb1b
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1061417 - [SMS] We don't properly discard the draft in some occasions r=azasypkin

========

https://hg.mozilla.org/integration/gaia-2_0/rev/3d3c39cb85d2
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24555 from rabbihossain/v2.0

Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings

========

https://hg.mozilla.org/integration/gaia-2_0/rev/d3d781e459c3
Author: rabbihossain <me@2hr.me>
Desc: Bug 1011584 - Bangladeshi Mobile Network's APN is not available in settings r=jaoo

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f42e56ca267b
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24583 from nullaus/v2.0

Merge pull request #24454 from nullaus/bug1069452

========

https://hg.mozilla.org/integration/gaia-2_0/rev/d376a41c04e5
Author: Ghislain 'Aus' Lacroix <aus@noiseport.org>
Desc: Merge pull request #24454 from nullaus/bug1069452

bug 1069452 - Never take screenshot of closing AppWindow if part of home...
(cherry picked from commit 2834baf4c7e34fe6ef335f0469f6d0f593c5922b)

Conflicts:
	apps/system/test/unit/callscreen_window_test.js

Manually resolved, this test does not exist in 2.0 because the callscreen
does not have it's own window type.

========

https://hg.mozilla.org/integration/gaia-2_0/rev/2ae3ad87a2b7
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24556 from asutherland/email-v20-pop3-no-date

Bug 1062728 - [email/pop3] POP3 sync breaks on messages that lack a Date header. v2.0-specific uplift. r=mcav

========

https://hg.mozilla.org/integration/gaia-2_0/rev/df72cbf4cc17
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1062728 - [email/pop3] POP3 sync breaks on messages that lack a Date header. v2.0-specific uplift. r=mcav

This is a minimal v2.0 specific uplift of the trunk fix for bug 1062728.  It
only includes the date logic to fix the specific error.
Bumping manifests a=b2g-bump
Bug 1067858 - Apply |AutoNoJSAPI| before calling mAudioChannelAgent->SetVisibilityState in order not to hit nsContentUtils::IsCallerChrome() in HTMLMediaElement::CanPlayChanged(). r=bz, a=bajaj
Bug 1069646 - Scale frame rate initialization in webrtc media_opimization. r=gcp, a=bajaj
Bug 1067437 - Disable resolution changes on OMX H.264 until OMX DSP code is updated. r=pkerr, a=bajaj
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/49831714ba0d
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24591 from yzen/bug-1071159

Bug 1071159 - fixing statusbar visibility in fullscreen app with utility...

========

https://hg.mozilla.org/integration/gaia-2_0/rev/0085c171e0b2
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1071159 - fixing statusbar visibility in fullscreen app with utility tray.
Bumping manifests a=b2g-bump
Bug 995438 - Call SpecialPowers.pushPermissions() to ensure permission change is completed before continuing the rest of the tests. r=baku, a=test-only
No bug - Skip the webapps tests on OSX because they became timeout-prone after the NSS update and nobody has time/inclination to investigate. a=bustage
DONTBUILD CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/94a38733cf98
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24628 from davidflanagan/bug1068986-v2.0

Merge pull request #24204 from davidflanagan/bug1068986

========

https://hg.mozilla.org/integration/gaia-2_0/rev/55414e0e86f5
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #24204 from davidflanagan/bug1068986

Bug 1068986: convert MediaFrame to use background-image instead of <img> r=justindarc(cherry picked from commit 5baa82f4abae9ce0d10c92a9ecee8fbc4da74e98)

Conflicts:

	shared/js/media/media_frame.js
	tests/python/gaia-ui-tests/gaiatest/apps/gallery/regions/fullscreen_image.py
Bumping manifests a=b2g-bump
Bug 1073486 - Define MOZ_WEBRTC_OMX when building webrtc.org code. r=jesup, a=lmandel

--HG--
extra : rebase_source : 5de14f9f47c7ea04bec06be1a7ecf4c34d0afc42
Merge mozilla-b2g32 to 2.0m. a=merge