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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/08ad2b4a8126
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14317 from AndreiH/bug945011_v1.2

Bug 945011 - Update Music app object to use Marionette Actions for tappi...

========

https://hg.mozilla.org/integration/gaia-1_2/rev/1c22029340f1
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Bug 945011 - Update Music app object to use Marionette Actions for tapping

========

https://hg.mozilla.org/integration/gaia-1_2/rev/7038be20999d
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14315 from AndreiH/bug_940295_v1.2

Bug 940295 - Refactor test_calendar_new_event to use default date values...

========

https://hg.mozilla.org/integration/gaia-1_2/rev/6da9f709edfa
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 940295 - Refactor test_calendar_new_event to use default date values. Also clean up calendar app locators

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/tests/functional/calendar/manifest.ini

========

https://hg.mozilla.org/integration/gaia-1_2/rev/d0b0fb8aeea5
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #14314 from AndreiH/bug_943865_v1.2

Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible

========

https://hg.mozilla.org/integration/gaia-1_2/rev/e0f32abeda60
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 943865 - Increase timeout in wait_for_filmstrip_not_visible