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

========

https://hg.mozilla.org/integration/gaia-central/rev/2bada567e78f
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #15969 from timdream/zh-layout-rename

Bug 967237 - Shorten the Zh layout labels, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/d26decb398ea
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 967237 - Shorten the Zh layout labels
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/8da926267a7e
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #15736 from fcampo/subject-too-high-bug963050

Bug 963050 - [SMS] Subject's line-height in composer is too high
r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/f4751bd645e2
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Bug 963050 - [SMS] Subject's line-height in composer is too high

========

https://hg.mozilla.org/integration/gaia-central/rev/62c20e1815be
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #15823 from mihai/bug_952554

Bug 952554 - [SMS] Find contacts when searching with multiple terms...
r=julien

========

https://hg.mozilla.org/integration/gaia-central/rev/e87cc9bdf3f7
Author: Mihai Cirlanaru <mihai@cirlanaru.com>
Desc: Bug 952554 - [SMS] Find contacts when searching with multiple terms which also include tel number
Bumping manifests a=b2g-bump
Bug 966899 - Rocketbar is not enabled after OTA update. Bump settingsDB version to read settins.json. r=bent
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/989491c72232
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 962938 - Inconsistent file path in zip file

========

https://hg.mozilla.org/integration/gaia-central/rev/9888e443d4ab
Author: Fabrice Desre <fabrice@desre.org>
Desc: Bug 962976 - Use a blacklist to avoid compressing specific file types which are already compressed r=yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/ec0c974e434e
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #15961 from yurenju/uncompress-2

Bug 957497 - Allow include of uncompressed data files in the package apps r=@timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/50c1ebb651a7
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 957497 - Allow include of uncompressed data files in the package apps

Conflicts:
	build/utils-xpc.js
	build/utils.js
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c2c906ac5327
Author: dwi2 <dwi2@dwi2.com>
Desc: Merge pull request #14298 from dwi2/bug938080

Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually r=crh0716

========

https://hg.mozilla.org/integration/gaia-central/rev/32b377b516bd
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 938080 - set 'xyz'.suspended to false if user toggle 'xyz'.enabled on manually
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/1ee8f4c86de4
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #16024 from jmcanterafonseca/fb_sync_fixed

Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebo...

========

https://hg.mozilla.org/integration/gaia-central/rev/543c71092e7d
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Bug 952691 - [B2G][Contacts][Facebook Sync]Contacts imported from Facebook do not sync every 24 hours to reflect profile changes.
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/ac5067e8cc18
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #15938 from AndreiH/bug964820

Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device

========

https://hg.mozilla.org/integration/gaia-central/rev/775716fc21d9
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 964820 - Re-enable test_cards_view_kill_apps_with_two_apps on device
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/043cb94030d0
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #16029 from KevinGrandon/bug_968103_cancel_rocketbar

Bug 968103 - [Rocketbar] Cancel button launches active card r=auswerk

========

https://hg.mozilla.org/integration/gaia-central/rev/2985fc64e9a8
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 968103 - [Rocketbar] Cancel button launches active card r=auswerk
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/11293bff4b77
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #15939 from KevinGrandon/bug_966902_rocketbar_search_clearing

Bug 966902 - [Rocketbar] Input handling. Do not clear search term.

========

https://hg.mozilla.org/integration/gaia-central/rev/72c4c83ad8f2
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 966902 - [Rocketbar] Input handling. Do not clear search term. r=benfrancis
Bumping manifests a=b2g-bump
Merge mozilla-central to b2g-inbound
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/0466de7e605c
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #15967 from comoyo/bug968085

Bug 968085 - Don't rely on global variable from keyboard.js in render.js. r=RudyL

========

https://hg.mozilla.org/integration/gaia-central/rev/4dade487755f
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 968085 - Don't rely on global variable from keyboard.js in render.js