From 499bc14205296e99d2154ee90b46d8901afff3cc Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 8 Jul 2014 17:45:31 -0700
Subject: [PATCH] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/69fb04742e82
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #21199 from dmarcos/bug1024692master

Bug 1024692: limit image decode size to 3mp on 256mb devices

========

https://hg.mozilla.org/integration/gaia-central/rev/37278f96aeb6
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Bug 1024692 - camera app is killed during zoom in/zoom out (out of memory) on 256 MB target
---
 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 ec1e2c4cf85..b0a4ab2a31b 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "1b1b21f5111593d70fb4e165c88a5fc3b15cd964", 
+    "revision": "69fb04742e822b40c952188bd0d8bdae2e97c244", 
     "repo_path": "/integration/gaia-central"
 }