Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
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/f6d6d9f13f70
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #20566 from bebef1987/gall-update

Bug 1021027 - [Flame] Investigate failure in gallery tests

========

https://hg.mozilla.org/integration/gaia-1_4/rev/81a123ae528f
Author: Dylan Chun Wong <d.chunwong@gmail.com>
Desc: Bug 1021027 - [Flame] Investigate failure in gallery tests
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/84e26e78fb62
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #20545 from crh0716/997601_v1.4

Bug 997601 - Save the caller id preferece across reboots

========

https://hg.mozilla.org/integration/gaia-1_4/rev/19dbd223185d
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 997601 - Save the caller id preferece across reboots
Bumping manifests a=b2g-bump
Bug 1014903 - Part 1: Handle audio state change properly. r=hsinyi, a=1.4+
Bug 1014903 - Part 2: Get active call by query. r=hsinyi, a=1.4+
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/52fc53988304
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #20454 from julienw/1018035-v1.4-cursor-hidden-activity

Bug 1018035 - v1.4 cursor hidden activity

========

https://hg.mozilla.org/integration/gaia-1_4/rev/5e29fa06f064
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1018035 - [Flame][v1.4][SMS]No cursor display when tap the message edit box.  r=azasypkin

(cherry picked from commit 534f9cf57b3fd85f7e408709a7f535e1b8ca3e81)

Conflicts:
	apps/sms/js/compose.js
	apps/sms/test/unit/compose_test.js
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump