Bug 973666 - Remove unnecessary TwoLineRow view (r=margaret)

--HG--
rename : mobile/android/base/resources/layout/two_line_row.xml => mobile/android/base/resources/layout/two_line_page_row.xml
Bug 973666 - Rename TwoLinePageRow.Description style to TwoLinePageRow.Url (r=margaret)
Merge mozilla-central to fx-team
Bug 963835 - FxA client handle incorrect capitalization in emails. r=rnewman
Bug 974370 - Remove unused OS/2 strings from unknownContentType.properties. r=dolske
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/85ee1d7c8429
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #15319 from KevinGrandon/bug_958340_node_modules_prototype

Bug 958340 - Download node_modules from github

========

https://hg.mozilla.org/integration/gaia-central/rev/940e50d9fd4f
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 958340 - Download node_modules from github
Bumping manifests a=b2g-bump
Bug 972253: Merge the content of DBusThread.cpp into Bluetooth code, r=echou

DBusThread.{cpp,h} maintains state for Bluetooth. This patch moves
the content of these files to Bluetooth's Bluez backend.
Bug 972253: Cleanup Start/Stop methods in BlueZ backend, r=echou

This patch cleans up the code for starting and stopping DBus
connections in the BlueZ backend of Bluetooth. It also fixes
a bug were the initial 'adapteradded' reply might have been
missed.
Bug 972253: Remove GetDBusConnection, r=echou

All calls to GetDBusConnection have been replaced by direct references
to sDBusConnection.
Bug 972253: Remove DBusThread.{cpp,h}, r=kyle

These files are obsolete and not used any longer.
Merge mozilla-central to b2g-inbound
Bug 972536 - Add a tool for gathering USS memory data for a process over time for memory leak detection. r=dbaron
Bug 960146. r=kats,wesj
Bumping gaia.json for 2 gaia revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/14b730ec837b
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Desc: Merge pull request #16436 from timdream/system2-hardwarebuttons-fix

Bug 974261 - Volume buttons stucks, need clearTimeout() +shepherd

========

https://hg.mozilla.org/integration/gaia-central/rev/78ffacdc778c
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 974261 - Volume buttons stucks, need clearTimeout()
Bumping manifests a=b2g-bump
Merge fx-team to m-c.
Merge inbound to m-c.
Merge m-c to inbound on a CLOSED TREE.