Bug 925082 - Open PinSiteDialog with current pinned term. r=wesj a=bbajaj
Bug 933428 - Remove "Share" and "Add to Home Screen" from about:home context menus. r=sriram a=lsblakk
Bug 933428 - (Part 2) Update tests to deal with context menu changes. r=gbrown a=lsblakk
Bug 926706. When nsGfxScrollFrameInner::UpdateOverflow decides we need to update the scrollbars, don't reflow the scrollframe with NS_FRAME_IS_DIRTY since that reflows all descendants. Just reflow the frame itself and don't dirty anything else. r=tn a=lsblakk
Bug 928607. Ensure that nsGfxScrollFrameInner::UpdatePosition clips the overflow area of its children. r=tn a=lsblakk
Bug 932168 - Use simple IME context when focus field has focus (partially backing out a patch for bug 906072). r=karlt, a=lsblakk
Bug 919454 - Add a rule to catch broken StretchRect(). r=bjacob, a=lsblakk
Bug 894903 - Add new VS2010 install location to build PATH. r=ted, a=NPOTB
Bug 919528 - Use short path to MSVS10, set LD using _VSPATH. r=ted, a=NPOTB
Bug 919528 - Export LD path that works with both GNU make and Pymake. r=catlee, a=NPOTB
Bug 918414 - Look for gapi.data on c: then e:. r=catlee, a=NPOTB
Bug 925894 - Normalize cl generated dependencies before testing for spaces in them. r=gps, a=NPOTB
Bug 907902 - Create system isolated virtualenv, remove --system-ply support. r=glandium, a=NPOTB
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/010fd4451015
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Merge pull request #13460 from dominickuo/v1.2-bug-935326

Bug 935326 - [music] Handle the share button when the player is not launched by open activity, r=@jimporter

========

https://hg.mozilla.org/integration/gaia-1_2/rev/e3bb98955df4
Author: Dominic Kuo <dkuo@mozilla.com>
Desc: Bug 935326 - [music] Handle the share button when the player is not launched by open activity
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/843a01e13eeb
Author: Julien Wajsberg <felash@gmail.com>
Desc: Merge pull request #13503 from julienw/906316-1.2-uplift

Bug 906316 - Don't download the xulrunner SDK each time we change a bran...

========

https://hg.mozilla.org/integration/gaia-1_2/rev/4a41ecf43b57
Author: Julien Wajsberg <felash@gmail.com>
Desc: Bug 906316 - Don't download the xulrunner SDK each time we change a branch if their configuration are different r=yurenju,asuth,ochameau

This also shows a message when the archive file seems to be corrupted, advising
to run "make really-clean". Also changed "make really-clean" to remove all
xulrunner related files.

We now uncompress the archive directly in a specific directory that should
change when we change the URL.

We use a dot file inside the xulrunner SDK directory to keep the URL used to
download that SDK.

Now we can also define XULRUNNER_DIRECTORY from the command-line. If not
defined, it will use the default xulrunner-sdk-26/xulrunner-sdk.
We can also define XULRUNNER_BASE_DIRECTORY which is the place where the
XULRunner SDK will get uncompressed.

We export the new XULRUNNER_DIRECTORY variable along with the
existing various xulrunner program paths. These paths have been made absolute
using make's `abspath` operation.

The patch also removes the ./ prefixes to those paths as they're likely useless
and prevent from using an absolute path when defining XULRUNNER_DIRECTORY from
the command line.

This patch also remove the email's build_stage directory when running "make
clean".

This _will_ make all devs redownload XULRunner, sorry.

This make the build fail if submakes fail

Also add documentation at the top of the Makefile.

(cherry picked from commit f6df42dddb0ef62c64d90d9ca06fba779ea6cd78)

Conflicts:
	Makefile
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/e6c10f1f506e
Author: Fernando Campo <fernando.campo@o2.com>
Desc: Merge pull request #13091 from fcampo/wifi-timeout-889623

Bug 889623 - [FTE] need to be able to cancel Wifi Scanning. (r=julienw)(cherry picked from commit 044080112cf1d4a97e46532bd5ff122334d5213a)

Conflicts:
	apps/communications/ftu/test/unit/navigation_test.js

========

https://hg.mozilla.org/integration/gaia-1_2/rev/a9275a19d46b
Author: Fernando Rodríguez Sela <frsela@tid.es>
Desc: Merge pull request #13025 from frsela/STK/Bug928580

Bug 928580 - STK: No terminal response sent for DTMF for no alphaId case, r=timdream
(cherry picked from commit 42bbe26a72e030faf07a6fc297f61a3a8ccda25b)
Bumping gaia.json for 1 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/13af70079636
Author: root <root@localhost.localdomain>
Desc: Bug 923821 - Repair and re-enable test_killall.py TestKillAll.test_kill_all. r=zcampbell r=dhunt
Bumping gaia.json for 2 gaia-1_2 revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-1_2/rev/1e2d00c9e0b3
Author: Florin Strugariu <bebef_1987@yahoo.com>
Desc: Merge pull request #13514 from teodosia/bug93544-aurora

Bug 935444 - Strengthen wait_for_outgoing_call in CallScreen app object

========

https://hg.mozilla.org/integration/gaia-1_2/rev/b295537bf61f
Author: Teodosia Pop <teodosia.pop@gmail.com>
Desc: Bug 935444 - Strengthen wait_for_outgoing_call in CallScreen app object
Bug 934891 - Remove DISCONNECTING state from A2DP. r=echou, a=koi+
Bug 929004 - Check to see if lock is null before using it. r=qDot, a=koi+