Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
commit67de9a48d159e1bf2d957fb9680b0ed910f8c9d0
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Fri, 30 Jan 2015 03:46:04 +0000 (29 19:46 -0800)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Fri, 30 Jan 2015 03:46:04 +0000 (29 19:46 -0800)
tree64369c41ffff59800b2d1b3cd02695d3ba7d5e83
parent0f57cae7fef835316062903b0de77cd611d3dffb
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/28dabef7d06c
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #27489 from EragonJ/v2.1-bug-1107696

Bug 1107696 - Fix the problem that cannot connect to hidden network, r=crh0716

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a9ac3df2e78b
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 1107696 - Fix the problem that cannot connect to hidden network

Because in wifi_join_hidden panel, we were overriding the wrong
properties and this would make this panel broken after first-time use

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a245a14de102
Author: Steve Chung <schung@mozilla.com>
Desc: Bug 1118154 - [FFOS7715 v2.1] [dolphin] FFOS can not receive Cell Broadcast messages on SIM2, r=kgrandon

Conflicts:
apps/system/js/cell_broadcast_system.js
apps/system/test/unit/cell_broadcast_system_test.js
b2g/config/gaia.json