Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
commit21e42364c22b8a86851cb4f78526af9abeca6350
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 7 Apr 2015 04:57:10 +0000 (6 21:57 -0700)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 7 Apr 2015 04:57:10 +0000 (6 21:57 -0700)
tree6c12b1727768a0fc67abf727ebc83fca0ea5ad06
parent639df2d42b6418b0700c1d2c43ee316f10e72dfa
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1s/rev/f9a3e2b4c20d
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge branch 'v2.1' into v2.1s

========

https://hg.mozilla.org/integration/gaia-2_1s/rev/7fe941496d6d
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #29320 from RudyLu/keyboard/Bug1132778-Fulah_dictionary_v2.1

Bug 1132778 - merge pull request #28588 from

========

https://hg.mozilla.org/integration/gaia-2_1s/rev/02848261e4cd
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1132778 - merge pull request #28588 from RudyLu:keyboard/Bug1132778-Fulah_dictionary to mozilla-b2g:master

(cherry picked from commit bfe504b49533fb268c5ddda99c606aa66442b313)

Conflicts:
apps/keyboard/test/build/integration/resources/all-layout-make-layouts.json
apps/keyboard/test/build/integration/resources/no-preload-dict-required-make-layouts.json

========

https://hg.mozilla.org/integration/gaia-2_1s/rev/e1de0543c5f1
Author: Guillaume Marty <edo999@gmail.com>
Desc: Bug 1139470 - Minimized and maximized statusbar can become out of sync

========

https://hg.mozilla.org/integration/gaia-2_1s/rev/9ecf4ba267a0
Author: Martijn <martijn.martijn@gmail.com>
Desc: Merge pull request #29222 from mwargers/test_cost_control_data_alert_mobile.py_v2.1

Bug 1141447 - Fix test_cost_control_data_alert_mobile.py,  v2.1 version

========

https://hg.mozilla.org/integration/gaia-2_1s/rev/877385fe6be3
Author: Martijn Wargers <mwargers@mozilla.com>
Desc: Bug 1141447 - Fix test_cost_control_data_alert_mobile.py,  v2.1 version
b2g/config/gaia.json