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

========

https://hg.mozilla.org/integration/gaia-central/rev/52a3492784fa
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #17370 from alivedise/bugzilla/961800_master_merging/child-window-factory

Bug 961800 - Implement Child Window Factory, r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/a1a234a4883e
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 961800 - Implement Child Window Factory

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css
This commit is contained in:
B2G Bumper Bot 2014-03-20 03:55:52 -07:00
parent b600b8e0ab
commit deede29ffd

View File

@ -4,6 +4,6 @@
"branch": "", "branch": "",
"revision": "" "revision": ""
}, },
"revision": "c9674d6741726fc4e28fcbef938b4b058696a049", "revision": "52a3492784fa8492f9faaa66cc99a50e95c0d8c3",
"repo_path": "/integration/gaia-central" "repo_path": "/integration/gaia-central"
} }