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

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f4d654fb6acb
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #24298 from julienw/1018896-v2.0-firefox-version

Bug 1018896 - In Travis, fetch the right version of Firefox and b2g r=me...

========

https://hg.mozilla.org/integration/gaia-2_0/rev/2ff1bd0e430b
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1018896 - In Travis, fetch the right version of Firefox and b2g r=me a=tests
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Bug 1022862 - Create a manifest just for marionette web-api tests. r=jgriffin, a=test-only
Fix bug 1064636, r=rrelyea, a=bajaj
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_0/rev/47eabf570361
Author: Andrew Sutherland <asutherland@asutherland.org>
Desc: Bug 1058900 - [email] Workaround graphics corruption / memory spikes by cleaning up HTML display logic. r=jrburke

========

https://hg.mozilla.org/integration/gaia-2_0/rev/bbb906dd1967
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #24337 from julienw/1052447-v2.0-fix-exit-activity-on-delete

Bug 1052447 - [Messages] when we're in an activity and we delete all mes...

========

https://hg.mozilla.org/integration/gaia-2_0/rev/f2d35f7af6fb
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 1052447 - [Messages] when we're in an activity and we delete all messages in the thread, we should close the activity r=azasypkin

Conflicts:
	apps/sms/js/thread_ui.js
Bumping manifests a=b2g-bump