Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-1_2/rev/31e00c655bea
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #14318 from AndreiH/test-flick-calendar-through-months_v1.2

Bug 937085 - Write test to flick calendar through months

========

https://hg.mozilla.org/integration/gaia-1_2/rev/edf355641622
Author: Andrei Hutusoru <andreihutusoru@P5069.(none)>
Desc: Bug 937085 - Write test to flick calendar through months

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