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

========

https://hg.mozilla.org/integration/gaia-2_1/rev/a6fdee59e532
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Bug 1080912 - [Camera]The camera button and video button will fail to function when the user opens and closes the camera app multiple times via the home button

========

https://hg.mozilla.org/integration/gaia-2_1/rev/7e7b5b9e9ec0
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25482 from cctuan/1079567-v21

Bug 1079567 - [NFC][Shrinking UI] App is rendered as a black screen if the recipient device is pulled away before the user finishes the transfer gesture.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/6bcbb2f62df5
Author: cctuan <georgeiscoming@gmail.com>
Desc: Bug 1079567 - [NFC][Shrinking UI] App is rendered as a black screen if the recipient device is pulled away before the user finishes the transfer gesture.

========

https://hg.mozilla.org/integration/gaia-2_1/rev/7b60facfcab6
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Merge pull request #25560 from crh0716/1079356_v2.1

Bug 1079356 - Use "types" instead of "type" when creating APN items r=gsvelto

========

https://hg.mozilla.org/integration/gaia-2_1/rev/940ce650ecc7
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 1079356 - Use "types" instead of "type" when creating APN items

Conflicts:
	apps/wappush/js/cp_screen_helper.js
Bumping manifests a=b2g-bump