Bug 949104 - Don't write history visits during HTTP redirection r=rnewman
Bug 1094137 - Create a common shared store creator for Loop. r=Standard8
Backed out changeset 5b80055fba93 (bug 949104) for Android 4.0 Debug Test failures
Bug 1074932 - Desktop client user can access product tour from gears menu. r=MattN
Bug 1101006 - Refactor mozLoop.{get, set}LoopCharPref and mozLoop.{get, set}LoopBoolPref to mozLoop.{get, set}Pref that uses getPrefType. r=mikedeboer
Bug 1008435 - Let the Gecko Profiler work with child processes. r=BenWa,smaug.

We now allow profiling the content process for e10s, and plugin processes.

--HG--
extra : rebase_source : 1f2e35d4d55b33b56160132893dbf7d4787925fa
extra : amend_source : d03465d4318f8e50c7624ad0eeb681b30c068b11
Bug 1099501 - Export and use ANDROID_TOOLS where appropriate. r=snorp,bnicholson

In certain configurations, in particular when installing the Android SDK
using HomeBrew, one sees a configuration with symlinks like:

    [brian@brian-macbook git]$ ls -l /usr/local/Cellar/android-sdk/23.0.2/
    total 72
    ...
    lrwxr-xr-x   1 brian  admin    38 Nov 14 16:39 platforms -> ../../../var/lib/android-sdk/platforms
    ...
    drwxr-xr-x  26 brian  admin   884 Nov 14 17:43 tools

In this case, we have
ANDROID_SDK=/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21.

It is an anti-pattern to use ANDORID_SDK/.. to find other paths in the
tree.  This pattern is used in at least two places:

1) When we try to find
/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21/../../tools,
we end up in the /usr/local/var/lib subtree.  This patch works around
that by exporting and using ANDROID_TOOLS; ANDROID_TOOLS itself is
extracted using path matching, rather than following .. through the
filesystem.

2) We also need to use ANDROID_SDK_ROOT rather than
ANDROID_SDK/../.. through-out.

--HG--
extra : rebase_source : 5e0323a94f2b80550f17a624e16f338cdeec406d
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/587d98bf2662
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Revert "Merge pull request #26192 from jmcanterafonseca/fix_del_button"

This reverts commit 6f6e4b9b395b95dd920ee701d0c5ec6aa2c1d805, reversing
changes made to f004f8c891c4a6510a4679f3804ba3123af26615.
Bumping manifests a=b2g-bump
Merge fx-team to m-c. a=merge
Merge b2g-inbound to m-c. a=merge
Bug 1098139 - Add attribute isPrimary detection for got/lostpointercapture events. r=smaug
Bumping gaia.json for 3 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/f1780ba84565
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26257 from chirarobert/bug_1100994

Bug 1100994 - [v2.2] Fix test_settings_device_info.py failure

========

https://hg.mozilla.org/integration/gaia-central/rev/72068b0d3e50
Author: Robert Chira <robertchira@P5075.(none)>
Desc: Bug 1100994 - [v2.2] Fix test_settings_device_info.py failure

========

https://hg.mozilla.org/integration/gaia-central/rev/3abadcdbd9ce
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1100305 - Disable intermittent failing browser test. r=me
Bumping manifests a=b2g-bump
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/9650380d8ede
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #26208 from eeejay/bug-1069422

Bug 1069422 - Use gaia-select for combo boxes. r=salva

========

https://hg.mozilla.org/integration/gaia-central/rev/236618bbe7e1
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1069422 - Use gaia-select for combo boxes.

========

https://hg.mozilla.org/integration/gaia-central/rev/87d2fd662016
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #26259 from lightsofapollo/bug-1097591

Bug 1097591 - vbump marionette-apps = v0.3.12

========

https://hg.mozilla.org/integration/gaia-central/rev/a5c685cb161a
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 1097591 - vbump marionette-apps = v0.3.12
Bumping manifests a=b2g-bump
Bumping gaia.json for 1 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/84488fe79fc6
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 1094076 - Disabling intermittent failed tests. r=me
Bumping manifests a=b2g-bump
Bumping manifests a=b2g-bump
Merge m-c to b2g-inbound a=merge