Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
commit0a2a1a7c62e0c3c67e0d4f27cc9d067a7b4b9b6f
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 10 Mar 2015 18:30:20 +0000 (10 11:30 -0700)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 10 Mar 2015 18:30:20 +0000 (10 11:30 -0700)
tree22efff0254e46a091304c4bc92bc010e452e4841
parent1cbdb988fc9c1b57baff17f40c3b1cded5a78fc7
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/58fce26466a5
Author: albertopq <albert.pastor@gmail.com>
Desc: Merge pull request #28758 from albertopq/1092022-uplift-v2.1

Bug 1092022 - Fixing intermitent test failure in chrome progressbar r=kgrandon a=testonly

========

https://hg.mozilla.org/integration/gaia-2_1/rev/f68879227be7
Author: albertopq <albert.pastor@gmail.com>
Desc: Bug 1092022 - Fixing intermitent test failure in chrome progressbar r=kgrandon a=testonly

Conflicts:
apps/system/test/marionette/browser_fullscreen_navigation_chrome_test.js
shared/test/integration/tbpl-manifest.json
b2g/config/gaia.json