Remove unused NTP servers from gps.conf

These aren't used so they should be removed to avoid causing confusion.

Change-Id: I2e45fc79c968570c5f244f636b476f6f6cb1d0a9
Merge "Remove unused NTP servers from gps.conf" into jb-mr1-dev
am a7ca0814: Merge "Remove unused NTP servers from gps.conf" into jb-mr1-dev

* commit 'a7ca08142caa2781c073bc3a3e21ca01af9b4a63':
  Remove unused NTP servers from gps.conf
am ca85fa04: am a7ca0814: Merge "Remove unused NTP servers from gps.conf" into jb-mr1-dev

* commit 'ca85fa0441b7191169680b542864f86a48b5e300':
  Remove unused NTP servers from gps.conf
Merge "mako: bluetooth: Implement BT DUT mode" into jb-mr1-dev
am fb4ed8a4: Merge "mako: bluetooth: Implement BT DUT mode" into jb-mr1-dev

* commit 'fb4ed8a4852345bb0e4fb4f8d2ddb294508f54fe':
  mako: bluetooth: Implement BT DUT mode
am 55e5d23d: am fb4ed8a4: Merge "mako: bluetooth: Implement BT DUT mode" into jb-mr1-dev

* commit '55e5d23d8a8ad9f20e0339b4836a6d6379a4dbe7':
  mako: bluetooth: Implement BT DUT mode
mako: add mdm thermal sensor configuration

Change-Id: I7148aae16167511802d1e6b50bc41ae0ea92a49c
am f1f28ec6: mako: add mdm thermal sensor configuration

* commit 'f1f28ec60d5155338bc1d9970f8a1208fd6a9daa':
  mako: add mdm thermal sensor configuration
am b15c6dce: am f1f28ec6: mako: add mdm thermal sensor configuration

* commit 'b15c6dce0b16f6b2b0fa20574a2ded3298e141b9':
  mako: add mdm thermal sensor configuration
mako: set default notification color to white

bug: 7047002
Change-Id: If0c3f24d9771265ebcaf5ffd780e89c769e97bfe
Merge "mako: set default notification color to white" into jb-mr1-dev
am fc00ff51: Merge "mako: set default notification color to white" into jb-mr1-dev

* commit 'fc00ff51c4d065a02fe3f2bc5dcd108f8a5b108f':
  mako: set default notification color to white
am 95a40ba8: am fc00ff51: Merge "mako: set default notification color to white" into jb-mr1-dev

* commit '95a40ba8feeb7e8830be528c757b7f041148ae79':
  mako: set default notification color to white
mako: Update wlan config to derive p2p0 MAC Address

The Qualcomm WCN WLAN driver supports two interfaces, wlan0 and p2p0.
OEMs can choose to either provision two distinct MAC Addresses, one
per interface, or they can choose to provision a single MAC Address
that will be assigned to wlan0, and the MAC Address for p2p0 will be
derived from the wlan0 MAC Address by setting the "locally
administered" address bit.  Since Mako only has a single MAC Address
provisioned, enable the "isP2pDeviceAddrAdministrated" configuration
item to notify the driver which provisioning is being used.

Change-Id: If18034960aa52bf03836c2e7ec576365cf9ab409
am dd4b6aa0: mako: Update wlan config to derive p2p0 MAC Address

* commit 'dd4b6aa002cc61abea9690f475420398795191e6':
  mako: Update wlan config to derive p2p0 MAC Address
am cd375ec4: am dd4b6aa0: mako: Update wlan config to derive p2p0 MAC Address

* commit 'cd375ec4573d0d6acfd82652a482cf0662712ba8':
  mako: Update wlan config to derive p2p0 MAC Address
auto-generated blob list

Bug: 4295425
Change-Id: I62654fc1d878e546c6a4d05d7d43b5e31f9f789b
Merge "auto-generated blob list" into jb-mr1-dev
am 52fa72e2: Merge "auto-generated blob list" into jb-mr1-dev

* commit '52fa72e254d0157da7f47881e6cc041429723145':
  auto-generated blob list