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

========

https://hg.mozilla.org/integration/gaia-central/rev/186dc9242740
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #17766 from julienw/revert-bad-revert

Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" ...

========

https://hg.mozilla.org/integration/gaia-central/rev/fc3ccbc1f7e1
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 989418 - Revert "Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL"

This reverts commit a9aa1882f4b0e472f3686b157eb119d17ae60a91.
The original revert broke a lot of things and was not done correctly.

Conflicts:
	apps/clock/js/panels/timer/panel.html
	shared/style_unstable/input_areas.css

========

https://hg.mozilla.org/integration/gaia-central/rev/b82006c4b2c8
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #17809 from davehunt/bug989951

Bug 989951 - Bump gaiatest version to 0.21.10

========

https://hg.mozilla.org/integration/gaia-central/rev/1c5240dd926d
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 989951 - Bump gaiatest version to 0.21.10. r=fstrugariu
This commit is contained in:
B2G Bumper Bot 2014-03-31 06:06:15 -07:00
parent 0b6148f0fc
commit 3406ecbfee

View File

@ -4,6 +4,6 @@
"remote": "",
"branch": ""
},
"revision": "37bae3d7a60152e54138e8f8d955aeaf6789a40f",
"revision": "186dc92427403c7021f4cb9bb6330c52620d0130",
"repo_path": "/integration/gaia-central"
}