Bug 921987 - Don't install inactive tests; r=ted
Bug 920292 - Part 1: Stop passing string literals as the first argument to MOZ_ASSERT; r=Waldo
Bug 922190 - Remove bundled copy of simplejson. r=gps

--HG--
extra : rebase_source : 5d33bafacd732e6bfb7acb6bb4d171eabb7d258a
Backed out changeset 09cca9f32103 (bug 848731) for mochitest-bc failures.
Bug 916322 - Add UnsetAttr to HTMLCanvasElement to catch the removal of attributes and keep the context it owns of matching size. r=khuey, r=jmuizelaar

The test is debug only, asserting without this fix.
bug 922109 - spdy/3 settings frame does not restart window starved streams r=hurley
Bug 917386 - Make frame construction handle trees of nsIAnonymousContentCreator::ContentInfo objects, including support for associating CSS pseudo-elements with deeply nested anonymous elements. r=bz
Bug 904346 - Shumway extension core files
Bug 904346 - Shumway extension abc files
Bug 904346 - Integrate Shumway into Firefox. r=gps
Bug 922007 - Use the new texture clients and hosts on fennec. r=mattwoodrow
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/a01f15016dbe
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #12267 from pivanov/bug-908241

Bug 908241 - [SMS] Add attachment highlight state doesn't extend to the top edge

========

https://hg.mozilla.org/integration/gaia-central/rev/ac06dcec05da
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Bug 908241 - [SMS] Add attachment highlight state doesn't extend to the top edge
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/90e0d49229d7
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #12737 from alivedise/bugzilla/922713/permission-dialog-button-text

Bug 922713 - Permission request button text, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/37f020bd45fc
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 922713 - Permission request button text.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/88155b68ab14
Author: GaryChen(pychen) <mmm198219@gmail.com>
Desc: Merge pull request #12792 from luke-chang/925685_test_keyboard_app_height

Bug 925685 - Make test keyboard app change its window height correctly. r=timdream.

========

https://hg.mozilla.org/integration/gaia-central/rev/bf4f3dcec39e
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 925685 - Make test keyboard app change its window height correctly, r=timdream
Bug 925672: Update manifest.ini, r=jgriffin

Make sure Marionette knows about the test for REQUEST_SCREEN_STATE.
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/cc720fef4c09
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #12460 from crh0716/919861

Bug 919861 - Connect a new device until the previous one is disconnected r=evelyn

========

https://hg.mozilla.org/integration/gaia-central/rev/b0f63b4e4285
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 919861 - Connect a new device until the previous one is disconnected
Bug 924678: Explicitly clear OmxDecoder::mDecoder, r=doublec

The MediaDecoderStateMachine frees the Decoder during its own
shutdown. If the the MediaDecoderStateMachine for an MP3 file
gets cleaned up before the MP3 frame parser is finished, the
OmxDecoder operates with an invalid Decoder.

With this patch, the MediaDecoderStateMachine informs the
OmxDecoder to clear the decoder field. The MP3 parser logic
detects this case and returns.

--HG--
extra : rebase_source : 0a00de3cf7b95ede77408e5d43cccbcd706750cd
Bug 924678: Stop MP3 parser if decoder got cleared, r=doublec

If the decoder has been cleaned up, there is no point in further
parsing the MP3 file. This patch makes the I/O logic stop in that
case.

The patch also fixes a bug where the beginning of an MP3 chunk was
parsed multiple times if the chunk is larger than 4 GiB.

--HG--
extra : rebase_source : d247ed3995991d362c51a0666274e9de3b90b7d2
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/e606978d2b2e
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #12757 from etiennesegonzac/bug-924479-better-utility-tray-physics

Bug 924479 - Better Utility Tray physics r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/cbdc2a21ee61
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 924479 - Better Utility Tray physics
Bug 925663 - Establish HSP connection if and only if HFP service record couldn't be found, r=gyeh