Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
commit6847ed11dddf8d618d712d30fb34240c391a3d57
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 30 Jun 2015 16:15:20 +0000 (30 09:15 -0700)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 30 Jun 2015 16:15:20 +0000 (30 09:15 -0700)
treebca5ca95ba742012c7bcb3edd9f6c41a49d49347
parentf0845f34385c20e032a0ead161514aadac35a6af
Bumping gaia.json for 6 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_2/rev/c42f9c2dabb9
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30722 from RudyLu/keyboard/Bug1137968-Ukrainian_keyboard_v2.2

Merge pull request #30274 from

========

https://hg.mozilla.org/integration/gaia-2_2/rev/13030078058f
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #30274 from RudyLu/ltedone-Bug_1137968-Create_Ukrainian_keyboard

Bug 1137968 - [B2G] Create Ukrainian keyboard.
r=rudylu
(cherry picked from commit 45afe9b99481d768d90a74a5322389f5873d844f)

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

========

https://hg.mozilla.org/integration/gaia-2_2/rev/3d553bc76899
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30723 from RudyLu/keyboard/Bug1160883-Frisian_layout_v2.2

Merge pull request #30256 from RudyLu/keyboard/Bug1153136-Add_Frisian_layout

========

https://hg.mozilla.org/integration/gaia-2_2/rev/7079dec4af9a
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #30256 from RudyLu/keyboard/Bug1153136-Add_Frisian_layout

Bug 1160883 - Add Frisian (fy or fy-NL) wordlist/dictionary.
r=timdream.
(cherry picked from commit b6c5fda821dce99babf8b9d5799a95eb4aeca64a)

Conflicts:
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

========

https://hg.mozilla.org/integration/gaia-2_2/rev/03607d7b7b3a
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #30706 from shamenchens/Bug1168256-MusicSearchInTile-v22

Bug 1168256 - Fix search during scanning music in tile/list view

========

https://hg.mozilla.org/integration/gaia-2_2/rev/3cce64873302
Author: Sherman Chen <shamen.chens@gmail.com>
Desc: Bug 1168256 - Fix search during scanning music in tile/list view
b2g/config/gaia.json