am 06b3d7c9: am df02653e: mako: disable WiFi background scan

* commit '06b3d7c9ead119100b49853d182fbac9493295e5':
  mako: disable WiFi background scan
am cf0cf3d1: am 06b3d7c9: am df02653e: mako: disable WiFi background scan

* commit 'cf0cf3d1c99f221f8eeee558ca0b767c8f00e03b':
  mako: disable WiFi background scan
merge in jb-mr1-release history after reset to jb-mr1-dev
Revert "Revert "mako: disable WiFi roaming""

This reverts commit 61d72e8323117a7922ba8c986a699a60d88c6e09

Change-Id: I1f39393552350c0a1ed9e2749b34d262f6fa34da
Merge "Revert "Revert "mako: disable WiFi roaming""" into jb-mr1-dev
merge in jb-mr1-release history after reset to jb-mr1-dev
am 8f95fb69: Merge "Revert "Revert "mako: disable WiFi roaming""" into jb-mr1-dev

* commit '8f95fb6951b9d3aefa02a8055e3cb07d95976a75':
  Revert "Revert "mako: disable WiFi roaming""
am 91d4d79b: am 8f95fb69: Merge "Revert "Revert "mako: disable WiFi roaming""" into jb-mr1-dev

* commit '91d4d79bd821bef38d6e23e0b78a1f74eae362cd':
  Revert "Revert "mako: disable WiFi roaming""
mako: enable WiFi roaming

Revert cubed.  Renaming to just "enable WiFi roaming" to preserve sanity.

This reverts commit aad6fa67acb6f9a930f9bcebb76f230c37ef85b5.
am aec96729: mako: enable WiFi roaming

* commit 'aec96729fbf79c0bc613b7ceb11c67178cbd0636':
  mako: enable WiFi roaming
am c298fc31: am aec96729: mako: enable WiFi roaming

* commit 'c298fc31e8c4403d61c31c135d7f5a57cb5bcb5a':
  mako: enable WiFi roaming
merge in jb-mr1-release history after reset to jb-mr1-dev
am 940e29f4: am 91d4d79b: am 8f95fb69: Merge "Revert "Revert "mako: disable WiFi roaming""" into jb-mr1-dev

* commit '940e29f43cedcce0ee879f28c8db51272a481230':
  Revert "Revert "mako: disable WiFi roaming""
am 97434dbb: am c298fc31: am aec96729: mako: enable WiFi roaming

* commit '97434dbb7b0c6d50558df788e271e9ab4204e1e9':
  mako: enable WiFi roaming
Temporarily disable AP roaming while we fix the issues in bug 7440701.

This reverts commit aec96729fbf79c0bc613b7ceb11c67178cbd0636

Change-Id: I7e321bb1c96857f65046c83e3deafa9cb7e1612d
am 9697216a: Temporarily disable AP roaming while we fix the issues in bug 7440701.

* commit '9697216a3e5da47dd6eb9ec9401f0d3bfe13ed90':
  Temporarily disable AP roaming while we fix the issues in bug 7440701.
am 7376e6a5: am 9697216a: Temporarily disable AP roaming while we fix the issues in bug 7440701.

* commit '7376e6a5fdbd6069165c35f53bce3e42c553aaa9':
  Temporarily disable AP roaming while we fix the issues in bug 7440701.
am 517919a9: am 7376e6a5: am 9697216a: Temporarily disable AP roaming while we fix the issues in bug 7440701.

* commit '517919a9de0c3dc0fd8490215e742f479154249d':
  Temporarily disable AP roaming while we fix the issues in bug 7440701.
merge in jb-mr1-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I485e19b1268b22f39d0f1e5bc634cb329b48852b