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

========

https://hg.mozilla.org/integration/gaia-1_2/rev/6a54cd7c95df
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13326 from bobsilverberg/cp930044

Bug 930044 - Python UI tests Enhance wait in test_sms_with_attachments to wait for messages app to resize the attached image

========

https://hg.mozilla.org/integration/gaia-1_2/rev/ee62356c93f4
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 930044 - Python UI tests Enhance wait in test_sms_with_attachments to wait for messages app to resize the attached image

========

https://hg.mozilla.org/integration/gaia-1_2/rev/364c906964e1
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13309 from bobsilverberg/cp918740

Bug 934145 - [v1.2] Update activities region and tests to be in line with master

========

https://hg.mozilla.org/integration/gaia-1_2/rev/a4867a951e3a
Author: Zac Campbell <zcampbell@mozilla.com>
Desc: Bug 918740 update the Activities system region locators to suit new menu/button style list r=bsilverberg/bebe

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/system/regions/activities.py