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

========

https://hg.mozilla.org/integration/gaia-central/rev/536b0405f97c
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL

This reverts commit 27c414d178694a17e7a2967fa377938163ac44ae, reversing
changes made to e592ec99013a43002171d1bd4be2f497c12ada88.

========

https://hg.mozilla.org/integration/gaia-central/rev/158472d7dba4
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl" because I didn't mean to revert this patch with everything else I reverted

This reverts commit b3564260d93fcf7d5127de26bb7f45d13b893a42.

========

https://hg.mozilla.org/integration/gaia-central/rev/864ab4a193de
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17356 from yurenju/stage2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/3726337a624c
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js

========

https://hg.mozilla.org/integration/gaia-central/rev/b92ea9307a62
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971546 - [System2] Instantiable Screenshot" for possibly breaking gaia-ui tests on TBPL

This reverts commit ec5be24bd877588f60f6c64715b894157a20c603.

========

https://hg.mozilla.org/integration/gaia-central/rev/78c3bf7a1577
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971577 - [System] Make visibility manager instantiable" for possibly breaking gaia-ui tests on TBPL

This reverts commit 73f3addd228aded613347bed46bd03a5941323d4.

========

https://hg.mozilla.org/integration/gaia-central/rev/fe177281e210
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 961800 - Implement Child Window Factory" for possibly breaking gaia-ui tests on TBPL

This reverts commit 439b23a04c6dba788293f577b1efe8c5d8843b78.

========

https://hg.mozilla.org/integration/gaia-central/rev/9ec410c953e8
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971556 - [System2] Instantiable SourceView." for possibly breaking gaia-ui tests on TBPL

This reverts commit 0611fa4704a77acfe2001c80afe56a98a081df77.

========

https://hg.mozilla.org/integration/gaia-central/rev/df7f69246d85
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 970028 - Nicer activity opener animation" for possibly breaking gaia-ui tests on tbpl

This reverts commit 870a91032c9d6bd84713618df0e80f0b50962488.

========

https://hg.mozilla.org/integration/gaia-central/rev/ca4be0a3a1e7
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong" for possibly breaking gaia-ui tests on tbpl

This reverts commit e592ec99013a43002171d1bd4be2f497c12ada88.

========

https://hg.mozilla.org/integration/gaia-central/rev/371d7310fbd4
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl

This reverts commit 2e388f26d4a1b484d1fcfded068bc82d18ca4bf9.

========

https://hg.mozilla.org/integration/gaia-central/rev/eb1509d301d6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17347 from qdot/985787-search-unit-test-fix

Bug 985787 - Change requireApp to require to make includes work in search unit test

========

https://hg.mozilla.org/integration/gaia-central/rev/f07f5d82deee
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 985787 - Change requireApp to require to make includes work in search unit test

========

https://hg.mozilla.org/integration/gaia-central/rev/73e7584ac6cd
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17314 from yurenju/big920431-2

Bug 920431 - [keyboard] keyboard_layout.json should be customizable r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/fd6275559f57
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 920431 - [keyboard] keyboard_layout.json should be customizable

Conflicts:
	build/settings.js
	build/test/integration/distribution.test.js
	build/webapp-manifests.js

b2g/config/gaia.json

@@ -4,6 +4,6 @@
         "branch": "", 
         "revision": ""
     }, 
-    "revision": "f9ecda33f49c5b475b24f60750c72bdf277085eb", 
+    "revision": "536b0405f97c8cc75a868cd89b6d9611c10632c9", 
     "repo_path": "/integration/gaia-central"
 }