Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-2_1/rev/6001252d5dab
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #25746 from KevinGrandon/bug_1090562_2_dot_1_uplift

Bug 1090562 - [Rocketbar] Transitions are missing

========

https://hg.mozilla.org/integration/gaia-2_1/rev/4d604b64e5ae
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1090562 - [Rocketbar] Implement transitions again r=etienne

Conflicts:
	apps/system/js/app_chrome.js
	apps/system/js/rocketbar.js
	apps/system/test/unit/rocketbar_test.js

========

https://hg.mozilla.org/integration/gaia-2_1/rev/f7e388e61622
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 1071114 - Tweaking the rocketbar collapsing transition.
Bumping manifests a=b2g-bump