Bug 1076866 - Rect highlighter; r=bgrins
Merge mozilla-central to fx-team
Bug 1097833 - Move local runtime behind a pref again. r=paul
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
Bug 1099345 - Use pattern rule to generate multiple outputs in widget/android/bindings. r=gps

This works around a race condition observed with GENERATED_SOURCES.  A
global solution might be to make GENERATED_SOURCES part of the
'export' tier; this is a smaller fix.

--HG--
rename : widget/android/bindings/mediacodec-classes.txt => widget/android/bindings/MediaCodec-classes.txt
rename : widget/android/bindings/surfacetexture-classes.txt => widget/android/bindings/SurfaceTexture-classes.txt
extra : rebase_source : 073dadd8c1b48ea32f975b2232c2bdeafe315ab4
Bug 1101494 Fix joining a room in guest mode. r=mikedeboer
Bug 949104 - Don't write history visits during HTTP redirection r=rnewman
Merge actual fx-team (previous merge push was a mislabeled inbound merge) to m-c a=merge