bug-821623 [General][Building Blocks] Disabled Button States are incorrect
Bug 837601 - Regression on grid after launching mouse support [r=arcturus]
Merge pull request #7943 from crdlc/bug-837601

Bug 837601 - Regression on grid after launching mouse support [r=arcturu...
Merge pull request #7904 from rnowm/bug-821623-gaia

bug-821623 [General][Building Blocks] Disabled Button States are incorrect
Merge branch 'camera-fix' of https://github.com/mozilla-b2g/gaia1a1f85031b6bf57324aa5a8aebca38e247f26bd9		remote-tracking branch 'upstream/master' of .