Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
commita4f6a64e4a22a9d58a34c9b1f8619f7aa41f4618
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 16 Jun 2015 22:25:15 +0000 (16 15:25 -0700)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 16 Jun 2015 22:25:15 +0000 (16 15:25 -0700)
tree1a3148bdd16937d7c94fcf6651ba5e6e3f091170
parentc10f7bc459e4a73b3ca152928f3bf05449cf1e3f
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