Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 16 Jun 2015 15:25:15 -0700
changeset 238642 54c620b1d7ef514fbc2cef6697f6df7d75950ae6
parent 238641 19f27b4fba89d6b794e79978bd01d0874bfdba01
child 238643 a2db74491088b0dfc3a93088ac00dd6a69f3ea56
push id701
push userffxbld
push dateTue, 16 Jun 2015 22:25:44 +0000
treeherdermozilla-b2g37_v2_2@a2db74491088 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgaia-bump
bugs1156141, 1114864
milestone37.0
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-2_2/rev/761dc42c09c0 Author: vliu <vliu@mozilla.com> Desc: Bug 1156141 - Make switch from boot animation to first system app screen seamlessly. r=alive ======== https://hg.mozilla.org/integration/gaia-2_2/rev/3374d72ede32 Author: Ryan VanderMeulen <ryanvm@gmail.com> Desc: Merge pull request #30611 from RudyLu/keyboard/Bug1114864-igbo_layout_v2.2 Bug 1114864 - merge pull request #29916 from ======== https://hg.mozilla.org/integration/gaia-2_2/rev/709a05400adb Author: autolander <bug.autolander@gmail.com> Desc: Bug 1114864 - merge pull request #29916 from RudyLu:keyboard/Bug1114864-igbo_layout to mozilla-b2g:master (cherry picked from commit be82b6edc1221f041f282b68570bbe3975b5ffec) Conflicts: apps/keyboard/test/build/integration/keyboard_test.js apps/keyboard/test/build/integration/resources/all-layout-make-layouts.json apps/keyboard/test/build/integration/resources/default-make-layouts.json apps/keyboard/test/build/integration/resources/no-preload-dict-required-make-layouts.json
b2g/config/gaia.json
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
-        "git_revision": "e7a0c6d5f4df04d45fb3f726efb9e8223600cb79", 
+        "git_revision": "3414b07dc489976bf510fd8042c0af3b1192c160", 
         "remote": "https://git.mozilla.org/releases/gaia.git", 
         "branch": ""
     }, 
-    "revision": "a59d057e5b699c27c54578b358faa833094fbb51", 
+    "revision": "761dc42c09c0a1f2d6d55ac09d24aa0f73a1e364", 
     "repo_path": "integration/gaia-2_2"
 }