Bug 1036977: Convert Bluedroid Socket's Connect method to asynchronous design (under bluetooth2/), r=btian
Bug 1036977: Introduce connection status for Bluedroid sockets (under bluetooth2/), r=btian

In preparaton of moving the Bluedroid socket setup to BluetoothInterface,
this patch introduces connection states for Bluetooth sockets. There are
4 states,

  - Disconnected,
  - Listening,
  - Connecting, and
  - Connected.

All sockets start in Disconnected and transition to Connected via one
of the other states. Server socket transition through Listening, Client
sockets transition through Connecting. There is currently a lot of code
duplication in read and write methods. This will be cleaned up when the
connection setup is handled by BluetoothInterface.
Bug 1036977: Handle socket setup for |Connect| in BluetoothInterface (under bluetooth2/), r=btian

Bluedroid's internal socket setup transfers 2 messages and possibly
a file descriptor as the first data of a socket connection.

This patch moves the socket-setup code for the |Connect| call to
the implementation of BluetoothInterface. BluetoothSocket only
handles the socket setup of |Listen|, and general socket state.
Bug 1036977: Handle socket setup for |Accept| in BluetoothInterface (under bluetooth2/), r=btian

This patch moves the accept phase of Bluedroid's |Listen| to the
implementation of BluetoothInterface. |BluetoothInterface::Accept|
handles Bluedroid's socket-setup messages and executes the result
handler with the received file descriptor and data.
Bug 1036977: Remove socket setup from BluetoothSocket (under bluetooth2/), r=btian

This patch removes all code related to socket setup from Bluedroid's
BluetoothSocket. The socket setup is handled by BluetoothInterface;
transparantly to its users.

Since most of the socket setup is now hidden, a comment was added to
DroidSocketImpl that explains the connection phases in server and
client.
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/dc502a74e9e5
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #21728 from yurenju/settings-git-commit-win

Bug 1036821 - git commit hash isn't wrote to settings/resources/gaia_commit.txt on Windows r=@cctuan

========

https://hg.mozilla.org/integration/gaia-central/rev/8c60421e42f9
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 1036821 - git commit hash isn't wrote to settings/resources/gaia_commit.txt on Windows

========

https://hg.mozilla.org/integration/gaia-central/rev/9ffcdd34817f
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #21557 from qdot/1031369-tutorial-sim-pin-upgrade

Bug 1031369 - Show System SIM PIN dialog on upgrade after tutorial

========

https://hg.mozilla.org/integration/gaia-central/rev/0653d4ac4a64
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 1031369 - Show System SIM PIN dialog on upgrade after tutorial
Bumping manifests a=b2g-bump
Bug 874353 - Remove CPU wake lock control from ContentParent
Backed out changeset 3ab7869b4c47 for bug 874353
Bug 874353 - Remove CPU wake lock control from ContentParent. r=gene, khuey
Bug 1034463 - Ensure that PCLocationMap only ever stores scripts from its own compartment. r=shu
Bug 1037081 - Remove the -moz-user-select from treecols. r=MattN
Bug 1037470 - Fix debug build bustage with Ion disabled. r=jandem
Bug 1034689 part 1 - Make AndroidBridge JSON parsing work with Latin1 strings. r=Waldo
Merge mozilla-central to mozilla-inbound
Bug 1036419 - Add lock to GrallocReporter::CollectReports() r=nical
Bug 857648 part 1.  Remove unnecessary code that tries to filter out non-JS stack frames from a known-JS-only stack.  r=khuey
Bug 857648 part 2.  Split JSStackFrame into a generic class and a JS-specific class.  r=khuey
Bug 857648 part 3.  Switch from using JS::DescribeStack to JS::CaptureCurrentStack for producing JSStackFrames.  r=khuey
Bug 857648 part 4.  Add a formattedStack attribute on nsIStackFrame.  r=khuey