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

========

https://hg.mozilla.org/integration/gaia-1_3/rev/235ecc881065
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17199 from AndreiH/fix_other_video_tests

Bug 983111 - [v1.3] test_play_3gp_video.TestPlay3GPVideo intermittently ...

========

https://hg.mozilla.org/integration/gaia-1_3/rev/beb47a346009
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 983111 - [v1.3] test_play_3gp_video.TestPlay3GPVideo intermittently fail
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/85de9f557cbc
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 981521 - Display notifications for messages with a "signal-none" action r=julienw
Bumping manifests a=b2g-bump
Merge b2g28 to v1.3t. a=merge
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/8e5815a81c03
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Bug 983038 - Play DTMF tones using active call's SIM card on multi-SIM devices r=etienne
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/2508e36d6e4c
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 894744 - Use localStorage event to make inter-page communication between music app and music activity
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/ff9e4969ed08
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Bug 894744 - Use localStorage event to make inter-page communication between music app and music activity"

This reverts commit db1715fcaf132b22ebdf12873564b0cfe42699ac.
Bumping manifests a=b2g-bump
Backed out changeset d53dc428fc55 (bug 958008) for causing bug 960224.
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/6f1e71973c70
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #17288 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button

========

https://hg.mozilla.org/integration/gaia-1_3/rev/fd3c4297a053
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16745 from julienw/974733-v1.3-sending-sms-activity

Bug 974733 - [Sora][Message]The conversation message display wrong after...

========

https://hg.mozilla.org/integration/gaia-1_3/rev/fb26e373087e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 974733 - [Sora][Message] We should not change panels when handling the "sending" event on the window that does not send the message r=schung

When the user presses the "send" button, we set a boolean, so
that when we receive the "sending" event, we know whether we're in the same
window.

(cherry picked from commit a8c1a5ad0936cf5c131afaf2bb5cf6b068e8535d)

Conflicts:
	apps/sms/js/thread_ui.js
	apps/sms/test/unit/thread_ui_test.js
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/b69cbc983572
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 975161 - Reland ensure SIM Pin inputs are visible. r=vingetun

This reverts commit 05337d2ce75651550892ca883030548ed5f7d6aa.

Conflicts:
	apps/system/test/unit/statusbar_test.js
	build/jshint/xfail.list