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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/d67b4a90ee50
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 929999 - Bump marionette_client dependency to 0.6.1 or above

Conflicts:
	tests/python/gaia-ui-tests/setup.py

========

https://hg.mozilla.org/integration/gaia-1_2/rev/fe4aecbc1f4b
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13321 from bobsilverberg/v1.2clock

Bug 934220 - [v1.2] Update clock app and tests to be in line with master

========

https://hg.mozilla.org/integration/gaia-1_2/rev/64bb63d8bc2c
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 926920 - Merge the two tests in test_clock_switch_clock_type.py

========

https://hg.mozilla.org/integration/gaia-1_2/rev/18aaf16c4503
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 926932 - Merge the tests in test_clock_create_new_alarm.py