Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
commitecfc52619cb7afb8b5f9beee7b633c2c780d7468
authorB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 19 May 2015 18:20:33 +0000 (19 11:20 -0700)
committerB2G Bumper Bot <release+b2gbumper@mozilla.com>
Tue, 19 May 2015 18:20:33 +0000 (19 11:20 -0700)
tree57e9897cd2c560626e98f4da68f38207652a1ca8
parent7fe9eb167e63ba4ab0b7e6707afa9212bbc5624c
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_2/rev/0b40240da67a
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #30127 from gabrielesvelto/bug-1162732-v2.2-uplift

Bug 1162732 - v2.2 uplift

========

https://hg.mozilla.org/integration/gaia-2_2/rev/40c1b313185f
Author: autolander <bug.autolander@gmail.com>
Desc: Bug 1162732 - merge pull request #30065 from gabrielesvelto:bug-1162732-speaker-and-mute-button-status to mozilla-b2g:master

(cherry picked from commit 23b3a165ce3bc4fc5e0ef63b8ad45c63ce636723)

Conflicts:
apps/callscreen/js/calls_handler.js
b2g/config/gaia.json