Bug 1075697 - MozLoopService.hawkRequest is not properly reset. r=dmose
Bug 1075069 - Backed out search term highlighting in the location bar (bug 1047469). r=ttaubert

--HG--
extra : rebase_source : de556821938f8d11a30487bbef0fb28a1a9f7ec7
Bug 1070689 - Change return type of dosprintf functions from int to bool (in jsprf.cpp). r=nbp
Bug 902762 pt 1 - Pass a 'vertical' flag to font shapers, and support vertical shaping through harfbuzz. r=jdaggett
Bug 902762 pt 2 - Support for vertical textruns and fonts through gfxTextRun::Draw. r=jdaggett
Bug 902762 pt 3 - Make DrawPartialLigature aware of vertical runs. r=jdaggett
Bug 902762 pt 4 - Support for orientation:sideways-right when drawing vertical textruns. r=jdaggett
Bug 902762 pt 5 - Handle vertical textruns when painting text in nsTextFrame. r=smontagu
Bug 902762 pt 6 - Handle vertical textruns for mouse click in nsTextFrame. r=smontagu
Bug 902762 pt 7 - Draw caret appropriately for vertical textruns. r=smontagu
No bug - Add documentation about the JSPROXYSLOT_EXPANDO slot; r=bz over IRC a=KWierso to land with DONTBUILD on a CLOSED TREE.
Merge fx-team to m-c a=merge despite the CLOSED TREE
Merge inbound to m-c a=merge despite the CLOSED TREE
Merge b-i to m-c a=merge despite the CLOSED TREE
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/686dbd9a1bdc
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1076454 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/system/test/marionette/browser_chrome_share_web_result_test.js | Browser Chrome - Share Web Result share web result via e-mail r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/b104ffd9d161
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1027707 - Replace the existing module loading facilities in calendar r=millermedeiros"

This reverts commit abf72f5e6259e4c2c5c744b603931f89ef4512c4.
Bumping manifests a=b2g-bump
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f24eb68a4149
Author: Rudy Lu <me@rudy.lu>
Desc: Merge pull request #24562 from RudyLu/ime/Bug1072805_ime_button_misAligned

Bug 1072805 - The [Cancel] button was misaligned in the IME menu.
r=alive, yzen.

========

https://hg.mozilla.org/integration/gaia-central/rev/eac72f26f8ae
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 1072805 - The [Cancel] button was misaligned in the IME menu.

========

https://hg.mozilla.org/integration/gaia-central/rev/62948fd4f081
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1076716 - Disable intermittent failing test, TEST-UNEXPECTED-FAIL | /builds/slave/test/gaia/apps/calendar/test/marionette/day_view_test.js | day view "before each" hook r=kgrandon
Bumping manifests a=b2g-bump
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f4b852465f55
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #24649 from alivedise/bugzilla/1055299_master/v6

Bug 1055299: Ignore continuous app launch request in homescreen side and...r=kgrandon

========

https://hg.mozilla.org/integration/gaia-central/rev/19ad9bd36b72
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 1055299: Ignore continuous app launch request in homescreen side and send homescreen to background while rocketbar is open in system side

Conflicts:
	shared/elements/gaia_grid/js/grid_view.js
Bumping manifests a=b2g-bump