From 19fbe7e4cfdecd389cfe4c93fffc39b62336baa2 Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Wed, 18 Feb 2015 12:50:35 -0800
Subject: [PATCH] Bumping gaia.json for 7 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/42da22fe3d59
Author: Gareth Aye <gaye@mozilla.com>
Desc: Merge pull request #28289 from gaye/retry-handle-bad-marionette-mocha-output

Add logging and error to retry script for case when marionette-mocha output is missing a=test-only

========

https://hg.mozilla.org/integration/gaia-central/rev/67df20d88567
Author: gaye <gaye@mozilla.com>
Desc: Fix regexp

========

https://hg.mozilla.org/integration/gaia-central/rev/c8767c4c6123
Author: gaye <gaye@mozilla.com>
Desc: Add logging and error to retry script for case when marionette-mocha output is missing epilogue

========

https://hg.mozilla.org/integration/gaia-central/rev/154f65bb243a
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #28156 from zbraniecki/1132038-l10n-allows-values-to-be-empty

Bug 1132038 - [L10n] Allow values to be empty. r=stas

========

https://hg.mozilla.org/integration/gaia-central/rev/190f1efccabc
Author: Zibi Braniecki <gandalf@mozilla.com>
Desc: Bug 1132038 - [L10n] Allow values to be empty

========

https://hg.mozilla.org/integration/gaia-central/rev/e1bbd8f687b9
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1129584 - merge pull request #28036 from davidflanagan:bug1129584.3 to mozilla-b2g:master

========

https://hg.mozilla.org/integration/gaia-central/rev/052021141503
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1129584 - initialize MediaDB and start creating thumbnails sooner
---
 b2g/config/gaia.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json
index c283d7985c0b..472b4cbf776d 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "cb452d55651beb33ae19a513824ad79d61799495", 
+        "git_revision": "620aecfde85a8b093247837c55de2708e22be1e1", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "6c1ba29d642ff2c115c2903ad08c5ba0638efbb8", 
+    "revision": "42da22fe3d59646d07bad417e194969dd2cc891d", 
     "repo_path": "integration/gaia-central"
 }