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
am 21a5ac64: am 52fa72e2: Merge "auto-generated blob list" into jb-mr1-dev

* commit '21a5ac64d9c58be8bbf1762b63be79c3de1f167b':
  auto-generated blob list
mako: thermal: remove lcd brightness control action

To prevent brightness control conflict between thermal daemon
and user application, the lcd brightness control is removed.

Change-Id: I6a83bec0de76ca4a74da64d89d8c1687a00ac2d4
am 10deb566: mako: thermal: remove lcd brightness control action

* commit '10deb566c5fc8e9dc5a09a86aedede15283d686d':
  mako: thermal: remove lcd brightness control action
am 0bfb6823: am 10deb566: mako: thermal: remove lcd brightness control action

* commit '0bfb68231ae89728a0328cb9fc637e2b02e0302f':
  mako: thermal: remove lcd brightness control action
Reconcile with jb-mr1-release - do not merge

Change-Id: I2cb26a07dce4310fdf07b5a2f4554cb10b595547
am 4e346b0e: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '4e346b0ec2415c1cb17bda9a1011379b36ea44bd':
  mako: support android.software.live_wallpaper
  mako: disable pre-rotation
  mako: bluetooth: bring up with bluedroid stack
  audio: apply audio tuning parameter
merge in jb-mr1-release history after reset to jb-mr1-dev
mako: overlay to mobile_dun feature

Change-Id: I2596c5586f7f6f7c7b8595d82347baf41c5b028d
audio: update audio calibration data

1. enable fluence mode for voice recognition
2. fix incorrect voice call gain.
 - When key tone and touch effect sound don't be used, set the gain for incorrect
voice call.
mako: decrease the consumption current during the off-mode charging

Change-Id: Ib42a14766c82db7ae8360d95aad392af2795f7e7
Merge "mako: overlay to mobile_dun feature" into jb-mr1-dev
am 430b9b91: audio: update audio calibration data

* commit '430b9b91ea1c08873debbb4cd3a47064409d6de9':
  audio: update audio calibration data