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

========

https://hg.mozilla.org/integration/gaia-central/rev/2ba34e93a4be
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Merge pull request #18561 from millermedeiros/987427-notification-rounding

Bug 987427 - [B2G][Calendar] Notifications for calendar alarms set for 2 hours before the event are incorrect r=gaye r=stas

========

https://hg.mozilla.org/integration/gaia-central/rev/fabc5f25398b
Author: Miller Medeiros <miller@millermedeiros.com>
Desc: Bug 987427 - [B2G][Calendar] Notifications for calendar alarms set for 2 hours before the event are incorrect
Bumping manifests a=b2g-bump
Backed out changeset eba1f5d0a908 (bug 864395) for Gaia integration test failures.
CLOSED TREE
Merge b2g-inbound to m-c.
Bug 776027 - Move intent handling to IntentHelper. r=wesj
Bug 776027 - Pass activity options instead of name through nsIActivityUIGlue. r=fabrice
Bug 776027 - Allow nsIActivityUIGlueCallback to handle native and web activities. r=fabrice
Bug 776027 - Pass web activities to Java. r=wesj
Bug 776027 - Map and launch web activities as Android intents. r=wesj
Bug 996995 - Add dissentious to the en-US dictionary. r=ehsan
Bug 924622 - Make sure gfx's ipc shutdown happens before shutting down xpcom threads. r=bsmedberg, sotaro
Bug 997121 - Mark CompsoitorOGL MOZ_FINAL to prevent future problems with the virtual call in its destructor. r=bjacob
Bug 1002271 - Remove jsanalyze files, r=jandem.
Backed out changeset c4bb530fc9db (bug 690937)
Backed out changeset 5bb66b16b70c (bug 996078) for B2G desktop build failures; CLOSED TREE
Bug 987311 - 1/6 - Make TextureFlags a typed enum, initial manual changes - r=nical
Bug 987311 - 2/6 - Make TextureFlags a typed enum, auto regex changes - r=nical

find gfx/layers -type f | xargs sed -i 's/\(^\|[^A-Za-z0-9_]\)TEXTURE_\(USE_NEAREST_FILTER\|NEEDS_Y_FLIP\|DISALLOW_BIGIMAGE\|ALLOW_REPEAT\|NEW_TILE\|COMPONENT_ALPHA\|RB_SWAPPED\|FRONT\|ON_WHITE\|ON_BLACK\|TILE\|RECYCLE\|COPY_PREVIOUS\|DEALLOCATE_CLIENT\|IMMUTABLE\|IMMEDIATE_UPLOAD\|DOUBLE_BUFFERED\|ALLOC_FALLBACK\)\($\|[^A-Za-z0-9_]\)/\1TextureFlags::\2\3/g'
find gfx/layers -type f | xargs sed -i 's/TEXTURE_FLAGS_DEFAULT/TextureFlags::DEFAULT/g'
Bug 987311 - 3/6 - Make TextureFlags a typed enum, final manual changes - r=nical
Bug 989027 - 1/2 - Make LayerRenderStateFlags a typed enum, manual changes - r=nical