Bug 823273 - Part 1: Music volume should be faded when notification sound is on going - AudioChannel changes. r=baku
Bug 823273 - Part 2: Music volume should be faded when notification sound is on going - IPC changes. r=baku
Bug 823273 - Part 3: Music volume should be faded when notification sound is on going - Media element. a=kinetik
Bug 823273 - Part 4: Music volume should be faded when notification sound is on going - FM Radio, Camera, Phone clients. r=rlin
Bug 823273 - Part 5: Music volume should be faded when notification sound is on going - Update tests. r=baku
Bug 916112 - Turn tiling back off. r=blassey
Bug 893800 - Install single variant apps the first time a SIM is detected. r=fabrice
Bug 893800 - Unit tests for the Single Variant Apps. r=fabrice
Bug 903291 - Part 2: Update newly created objects on childs with changes on parent. r=fabrice
Bug 916158 - Remove spurious setIntPref. r=jmaher
Merge m-c to b2g-inbound.
Bug 915986 - Part 1: Check pin2 in RIL. r=vicamo
Bug 915986 - Part 2: test case for pin2 is null. r=vicamo
Bug 915987 - Part 1: reuse nsIDOMContact.id. r=vicamo
Bug 915987 - Part 2: Update recordId for USIM contact. r=vicamo
Bug 915987 - Part 3: test case for contact.id. r=vicamo
Bug 908075 - Part1: "USER_ACTIVITY" event implement in RIL. r=yoshi
Bug 908075 - Part2: USER_ACTIVITY stk event xpcshell test. r=yoshi
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/8bf02cab2565
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12222 from gaye/unlock-marionette-version

Revert "Merge pull request #12221 from lightsofapollo/marionette-fix-state

========

https://hg.mozilla.org/integration/gaia-central/rev/5e41017959f0
Author: gaye <gaye@mozilla.com>
Desc: Revert "Merge pull request #12221 from lightsofapollo/marionette-fix-state"

This reverts commit 3f51f302c3a0c57d8bad482ec7ee86b2819389fb, reversing
changes made to 7596b8368097c3d5bd4c5fafd553dc6bfc2e3520.
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/059dfe10e057
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12230 from lightsofapollo/revert-915920

Revert "Merge pull request #12206 from qdot/915920"

========

https://hg.mozilla.org/integration/gaia-central/rev/3b73dcf0efec
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #12206 from qdot/915920"

This reverts commit 604e110b1387fe868f39b392e039a57aea129ccc, reversing
changes made to 173076ae0a1eca9a9644d05382629f8d5ea870f3.