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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/4a41f829eeb9
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #13342 from RudyLu/settings/Bug913784-language_keyboard_mapping

Bug 913784 - Language selection should also enable associated built-in
r=gnarf, arthur(cherry picked from commit 5cf3e2972c4d623ab0759ad85f6c4673ed9ed75f)

Conflicts:
	apps/settings/js/settings.js
	shared/resources/keyboard_layouts.json
Bug 818287 - Remove data URL prefix from screenshots. r=dhunt, a=test-only
Bug 937097 - Bump marionette_client version to 0.6.2. r=dhunt, a=test-only
Bug 919902 - [B2G][Helix][System][denghuachang] Device can not enter OS and stay on the third logo after uninstall some applications. r=ferjm, a=hd+
Bug 930381 - Follow the COM rules when calling ProcessSynthMouseMoveEvent. r=mats, smaug, tnikkel, a=abillings
Bug 930327 - Don't deoptimize the type of a coerced argument if it has other uses. r=jandem, a=abillings
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/c67e512b91e8
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Merge pull request #13588 from bebef1987/gallery

Bug 925854 - Re-enable test_gallery_edit_photo

========

https://hg.mozilla.org/integration/gaia-1_2/rev/98c3a90753b7
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 925854 - Re-enable test_gallery_edit_photo
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/d6aa54e33dba
Author: Jose Antonio Olivera Ortega <josea.olivera@gmail.com>
Desc: Merge pull request #13504 from jaoo/927486

Bug 927486 - [Settings] Modify Message settings category. r=arthurcc(cherry picked from commit 49b3e8cc689e1c189a86e28c20bc4726d553ee03)

Conflicts:
	apps/settings/elements/carrier_mms_settings.html
	apps/settings/index.html
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/16a47000c37d
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Merge pull request #13623 from AndreiH/bug936533_1.2

Bug 936533 - test_settings_bluetooth.py is failing, please fix

========

https://hg.mozilla.org/integration/gaia-1_2/rev/a0a4b14c1e25
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 936533 - test_settings_bluetooth.py is failing, please fix
Bug 936019 - Fix intermittent test_findelement.py. r=jgriffin, a=test-only
Bug 900953 - Fix test_bug513194.html intermittent failure related to PlacesDBUtils.jsm error. r=mak, a=test-only
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/055ea4290aa4
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Merge pull request #13621 from AndreiH/bug937079_v1.2

Bug 937079 - test_gallery_view.py is not switching to landscape view

========

https://hg.mozilla.org/integration/gaia-1_2/rev/ec822a52ab1f
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 937079 - test_gallery_view.py is not switching to landscape view
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/f1fd78d32024
Author: Sebastiaan de Haan <me@sebastiaandehaan.nl>
Desc: Bug 937118 - Bump marionette_client dependency because of bug 937097. r=dhunt
Bug 930327 - Fix typo. a=bustage
Bumping gaia.json for 4 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/d30adbb24c0d
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #13518 from bebef1987/936364

bug 936364 Address test_settings_wallpaper.py intermittent

========

https://hg.mozilla.org/integration/gaia-1_2/rev/227780e3bcbf
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: bug 936364 Address test_settings_wallpaper.py intermittent

========

https://hg.mozilla.org/integration/gaia-1_2/rev/85b133b88c2a
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #13506 from AndreiH/bug935433_1.2

Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions int...

========

https://hg.mozilla.org/integration/gaia-1_2/rev/f97244298814
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 935433 - Merge test_clock_all_items_present_new_alarm assertions into existing tests
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/22888ee4b51b
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #13620 from bebef1987/enable_three_apps

Bug 937629 - Reenable test_cards_view_kill_app_with_three_apps.py

========

https://hg.mozilla.org/integration/gaia-1_2/rev/c805ee6b3437
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 937629 - Reenable test_cards_view_kill_app_with_three_apps.py
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/fc41923b97bc
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #13626 from bebef1987/xfail_email

Bug 937644 - xfail send email tests on 1.2

========

https://hg.mozilla.org/integration/gaia-1_2/rev/664d4abb702f
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 937644 - xfail send email tests on 1.2
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/60d43c269aa2
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #13338 from evanxd/bug-925961"

This reverts commit 5eff7b00f3acaef6144d050a357b6d33e46807a9.

Because this commit is causing bug 937639
Merge m-b to b2g26. a=merge
bug 917642 - update helix backup. r=nhirata a=koi+