From 8ad7261229c91ba88f9274dbef8818988b470f0a Mon Sep 17 00:00:00 2001
From: B2G Bumper Bot <release+b2gbumper@mozilla.com>
Date: Tue, 18 Aug 2015 08:06:58 -0700
Subject: [PATCH] Bumping gaia.json for 10 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/2797866bed62
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #31368 from timdream/keyboard-lowercase3

Bug 1194509 - Always create two <span class=key-element>

========

https://hg.mozilla.org/integration/gaia-central/rev/84468ec19ab2
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 1194509 - Always create two <span class=key-element>

========

https://hg.mozilla.org/integration/gaia-central/rev/fe294180eadb
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #31209 from luke-chang/1094833_add_lol_hehe_to_wordlist

Bug 1094833 - Autocorrect should not correct 'lol' to 'lil'

========

https://hg.mozilla.org/integration/gaia-central/rev/49f752c89959
Author: Luke Chang <lchang@mozilla.com>
Desc: Bug 1094833 - Autocorrect should not correct 'lol' to 'lil'

- add "lol" and "hehe" to "en.dict" and "en_us.dict"

========

https://hg.mozilla.org/integration/gaia-central/rev/fafc656758a6
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #31357 from autra/bug-1193172

Bug 1193172 - Fix transitions with --transition-duration.

========

https://hg.mozilla.org/integration/gaia-central/rev/ef0f64609dc7
Author: Augustin Trancart <augustin.trancart@phoxygen.com>
Desc: Bug 1193172 - Fix transitions with --transition-duration.

========

https://hg.mozilla.org/integration/gaia-central/rev/846d0010a362
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #31335 from aosmond/bug1189105

Bug 1189105 - Do not show zoom bar on pinch if disabled.

========

https://hg.mozilla.org/integration/gaia-central/rev/b68b88ba8f11
Author: Andrew Osmond <aosmond@mozilla.com>
Desc: Bug 1189105 - Do not show zoom bar on pinch if disabled. r=justindarc

========

https://hg.mozilla.org/integration/gaia-central/rev/4807e9543149
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #31343 from aosmond/bug1192186

Bug 1192186 - Fix confirm dialog when recording via an activity.

========

https://hg.mozilla.org/integration/gaia-central/rev/d42cdb1a9a8f
Author: Andrew Osmond <aosmond@mozilla.com>
Desc: Bug 1192186 - Fix confirm dialog when recording via an activity.
---
 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 41da4fc1c74..d4189ea1e87 100644
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "ebd099a608587e205426143f5ac195034df28bbe", 
+        "git_revision": "370c1bcf726f9ed3cabe8ce84e61998a5fa0e141", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "d4e95119caa771ace567bdeebc97df0ac4ad74cf", 
+    "revision": "2797866bed62d7ce2f9557e7d8c6e7126593e75f", 
     "repo_path": "integration/gaia-central"
 }