Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
commit90f4195355f2f5c6303d12dba260a506716dfd72
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Wed, 13 May 2015 13:20:14 +0000 (13 06:20 -0700)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Wed, 13 May 2015 13:20:14 +0000 (13 06:20 -0700)
treeaac70f1a6573741785045668d15ec20fe9c4aa3e
parent186f827ded90ab64b3571561f1eccd8ee911f95c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_2/rev/7ae26d93d441
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #30044 from mikehenrty/bug-1159885-uplift

Merge pull request #29835 from mikehenrty/gmarty-Bug-1159885-Status-b…

========

https://hg.mozilla.org/integration/gaia-2_2/rev/8bf37b9ad1cd
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #29835 from mikehenrty/gmarty-Bug-1159885-Status-bar-is-not-visible-on-multiple-attention-windows

Gmarty bug 1159885 status bar is not visible on multiple attention windows
Conflicts:
apps/system/test/unit/statusbar_test.js
b2g/config/gaia.json