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

========

https://hg.mozilla.org/integration/gaia-1_4/rev/5b11b683281a
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #20750 from RudyLu/keyboard/Bug1015541

Bug 1015541 - choosing a word suggestion after moving the caret changes the wrong text
r=janjongboom
(cherry picked from commit 73b9c780c54ec1c6fcf47c2ce467672d3c5aaded)
a=1.4+

Conflicts:
	apps/keyboard/js/keyboard.js
Bumping manifests a=b2g-bump
Bug 994176 - Create branched versions of marionette-client and consumer packages. r=ahalberstadt a=test-only
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/867b988e6d34
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 987946 - [unittest] test_cold_launch.py failing

The test is failing because the correct app url is now not available until
shortly after launching.
This patch changes the test so it waits for the correct app url, rather than
just immediately asserting that it is as expected.

========

https://hg.mozilla.org/integration/gaia-1_4/rev/a7d3ffe173b4
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 994176 - Create branched versions of marionette-client and consumer packages. r=zcampbell
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b82a1fdcf76f
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after failed cronsync(s) r=mcav
Conflicts:
	apps/email/js/cards/compose.js

========

https://hg.mozilla.org/integration/gaia-1_4/rev/3c65ff37bbcb
Author: Jim Porter <jporter@mozilla.com>
Desc: Merge pull request #21003 from jimporter/email-as-download-body-failure

Bug 1009422 - [email/Activesync/hotmail] Apparent change in server behav...
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/b06b8a9e34f4
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #18966 from timdream/two-homescreen

Bug 996514 - Don't homescreenWindow.render() twice, r=alive
Conflicts:
	apps/system/js/app_window.js

========

https://hg.mozilla.org/integration/gaia-1_4/rev/f1f36a922897
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 992346 - Inline keyboard symbols font

========

https://hg.mozilla.org/integration/gaia-1_4/rev/a2a652a55b32
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20718 from crh0716/995458_v1.4

Bug 995458 - Only calls the last callback of an async operation r=jaoo, a=1.4+

========

https://hg.mozilla.org/integration/gaia-1_4/rev/2e92339e0210
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 995458 - Only calls the last callback of an async operation r=jaoo, a=1.4+
Bumping manifests a=b2g-bump
Bug 1025197 - Only clear the "recording hint" when switching to picture mode. r=dhylands, a=1.4+
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/a76b012af6a5
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Merge pull request #20993 from justindarc/bug1014968-v1.4

Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in came...

========

https://hg.mozilla.org/integration/gaia-1_4/rev/c30fce922091
Author: Justin D'Arcangelo <justindarc@gmail.com>
Desc: Bug 1014968 - [B2G][Camera][Flame] When watching a video preview in camera, there will be a cropping issue towards the end of the video
Bumping manifests a=b2g-bump
Bug 1025197 - Use correct MOZ_ASSUME_UNREACHABLE macro in b2g30 backport. a=bustage
CLOSED TREE
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/9b9c70ed594c
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #20828 from jrburke/bug1025727-email-cronsync-failsafe"

This reverts commit e68f589db4de9355c3ab1896e6f70d63d7d82809.
Bumping manifests a=b2g-bump
Bug 995599 - Skip FxA tests on b2g30 since FxA is disabled on B2G v1.4 anyway. rs=spenrose, a=test-only

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

========

https://hg.mozilla.org/integration/gaia-1_4/rev/2a0d167fb2d0
Author: James Burke <jrburke@gmail.com>
Desc: Merge pull request #21073 from jrburke/bug1025727-v1.4-email-cronsync-failsafe

Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s) r=mcav a=bajaj

========

https://hg.mozilla.org/integration/gaia-1_4/rev/84019cae3a65
Author: jrburke <jrburke@gmail.com>
Desc: Bug 1025727 - [email/cronysync] Failsafe abort/window.close after (multiple?) failed cronsync(s)

From master commit e64d7adf507d0f0164988257d30600499b1e5776

Conflicts:
	apps/email/js/cards/compose.js
Bumping manifests a=b2g-bump
Backed out changesets 236ef7ae3260 and 532de50fa217 (bug 1025197) for B2G mochitest failures.
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_4/rev/bce3e456dc11
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #21046 from arcturus/bug-987966

[DO NOT MERGE YET] Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'

========

https://hg.mozilla.org/integration/gaia-1_4/rev/763913f5d3b6
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Bug 987966 - [contacts] placeholder for date fields in add/edit mode is always in English: 'Date'