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

========

https://hg.mozilla.org/integration/gaia-central/rev/307c9c3cda8f
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #23832 from yurenju/merge-build-apps-2

Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript...

========

https://hg.mozilla.org/integration/gaia-central/rev/3be66e731951
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1053703 - Merge pre-app.js, app.js and post-app.js to one javascript file r=gduan

Conflicts:
	Makefile

b2g/config/gaia.json

@@ -4,6 +4,6 @@
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "b89c91b455083beee43f0cd4254965784f01509c", 
+    "revision": "307c9c3cda8f64a5c2932bff527f7c47840e1a47", 
     "repo_path": "/integration/gaia-central"
 }