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

========

https://hg.mozilla.org/integration/gaia-1_3/rev/460d63554ba7
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #17678 from crh0716/974253_v2_v1.3

Bug 974253 - Set preferred network type on startup based on the user preference

========

https://hg.mozilla.org/integration/gaia-1_3/rev/785ed4175430
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 974253 - Set preferred network type on startup based on the user preference
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/6cb47f80fb76
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 988148 - Hide the mobile connection state if it is emergency calls only and not primary sim

Conflicts:
	apps/system/js/lockscreen_connection_info_manager.js

========

https://hg.mozilla.org/integration/gaia-1_3/rev/d52e192901c0
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #17499 from dominickuo/bug-982540

Bug 982540 - [Music] Recover the status to PLAYING after the player is resumed from the mozinterrupend event, r=jimporter
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/8e27c3010ba3
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button
(cherry picked from commit 32078fe945de8001765526fa7e8e1283d3c09669)

Conflicts:
	apps/communications/contacts/test/unit/contacts_test.js
	apps/communications/contacts/test/unit/mock_navigation.js
Bumping manifests a=b2g-bump
Bug 985274 - Ensure generated callback function handles string objects. r=drno, a=test-only
Bug 909305 - Replace mozilla-banner.gif with a plain blue image in 163504-2*.html since we aren't trying to test individual pixel differences in resized image painting there. r=tn, a=test-only
Bug 919482 - Replace mozilla-banner.gif with a plain blue image in 163504-1*.html since we aren't trying to test individual pixel differences in resized image painting there. r=tn, a=test-only
Bug 978001 - Make nsViewManager::ProcessPendingUpdatesForView look at the local view manager instead of always the root one where it makes sense to do so. r=mats, a=1.3+
Bug 978001 - Null check presshell in nsViewManager::ProcessPendingUpdatesForView. r=mats, a=1.3+
Bug 946658. r=tn, a=1.3+
Backed out 2 changesets (bug 909305, bug 919482) for b2g emulator reftest-2 bustage a=backout

Backed out changeset 61463bde7078 (bug 919482)
Backed out changeset 8cd76e1aaa41 (bug 909305)
bug 989093 - stop creating+uploading hamachi.zip. r=catlee a=testing
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_3/rev/825f5da02d36
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Revert "Merge pull request #17499 from dominickuo/bug-982540"

This reverts commit 85c0ce7239d544add7be2d6053ed78e2b4a3dccf.
Bumping manifests a=b2g-bump
Merge b2g28 to v1.3t. a=merge