From 7bc88f8db4cd62bdb5e204308b6c90c8d3723bbe Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Fri, 19 Dec 2014 11:02:17 -0800
Subject: [PATCH] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/3aeca7ff73e2
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #26858 from sfoster/bug-1104194-20-update

Bug 1104194 - Add 2.0..2.2 upgrade configs, remove <2.0. r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/0d9a25acd003
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1104194 - Add 2.0..2.2 upgrade configs, remove <2.0

========

https://hg.mozilla.org/integration/gaia-central/rev/2368980082c0
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #26915 from mwargers/marketplace5

Bug 1094151 - Write a test to install & launch a packaged app from the M...

========

https://hg.mozilla.org/integration/gaia-central/rev/e60563797135
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1094151 - Write a test to install & launch a packaged app from the Marketplace

========

https://hg.mozilla.org/integration/gaia-central/rev/021e402ef959
Author: Sam Foster <sam@sam-i-am.com>
Desc: Merge pull request #26753 from sfoster/ftu-sim-manager-layout-bug-1107048

Bug 1107048 - Fix layout of sim details in FTU r=fcampo

========

https://hg.mozilla.org/integration/gaia-central/rev/f6bea7dd90e8
Author: Sam Foster <sfoster@mozilla.com>
Desc: Bug 1107048 - Fix layout of sim details in FTU r=fcampo
---
 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 7b41662f963..cfdcacf380d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "ef77bd6f1f6035439c75e05d8bdc8a800e1bb65c", 
+    "revision": "3aeca7ff73e2d3bd57f0d8f7a4a3ff74a641cdba", 
     "repo_path": "integration/gaia-central"
 }