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