From ca4d0f4ef5d5d1847439d6c312ebe950aedd3e19 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Thu, 15 Jan 2015 07:36:42 -0800 Subject: [PATCH] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/205f9594c8af Author: Florin Strugariu Desc: Merge pull request #27288 from AutomatedTester/bug1118201 Bug1118201 ======== https://hg.mozilla.org/integration/gaia-central/rev/19e40bf012f3 Author: AutomatedTester Desc: Bug 1118201: Add conditionals when importing marionette that it tries to use the monolithic package first and then the new marionette_driver package ======== https://hg.mozilla.org/integration/gaia-central/rev/901b246881e5 Author: AutomatedTester Desc: Bug 1118201: Simplify imports to allow easier updating --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index d215cbf663d2..b01c90edc7bf 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "remote": "", "branch": "" }, - "revision": "6183acaf72d994da0b985e9e67b2b27f1532f259", + "revision": "205f9594c8af076a4874a88ef4f336163fb568c2", "repo_path": "integration/gaia-central" }