am 80bc8ca0: am 66eac797: am e3b8003e: Merge "Mako: NFC: Re-enable Listen-F active." into jb-mr1-dev

* commit '80bc8ca040a8564e3a5fecaeff9c6cebf037f863':
  Mako: NFC: Re-enable Listen-F active.
merge in jb-mr1-release history after reset to jb-mr1-dev
Merge "Remove the Google specific location config." into jb-mr1-dev
am 0536bfef: Merge "Remove the Google specific location config." into jb-mr1-dev

* commit '0536bfef29e16b61a0716b404455a7707d547075':
  Remove the Google specific location config.
am ea08a01a: am 0536bfef: Merge "Remove the Google specific location config." into jb-mr1-dev

* commit 'ea08a01a326f9e717e07c599c00a55397679893e':
  Remove the Google specific location config.
am fda4a48d: am ea08a01a: am 0536bfef: Merge "Remove the Google specific location config." into jb-mr1-dev

* commit 'fda4a48d2784f742938e21fadd88a3c0c8f7fa42':
  Remove the Google specific location config.
mako: Update WLAN roaming configuration parameters

Bug: 7137333
Change-Id: I7eb4fd5aa0ac8eb78ff95c2daaea4abe3fc06c5e
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge "mako: Update WLAN roaming configuration parameters" into jb-mr1-dev
am 379fdaba: Merge "mako: Update WLAN roaming configuration parameters" into jb-mr1-dev

* commit '379fdaba4e9e609b68db1732e6ea11adf22445fe':
  mako: Update WLAN roaming configuration parameters
am ca81ef9d: am 379fdaba: Merge "mako: Update WLAN roaming configuration parameters" into jb-mr1-dev

* commit 'ca81ef9d654def24c50af91d1ad0d49d1b5cbb16':
  mako: Update WLAN roaming configuration parameters
am ab066de7: am ca81ef9d: am 379fdaba: Merge "mako: Update WLAN roaming configuration parameters" into jb-mr1-dev

* commit 'ab066de7f0317ae072d317b7ddfdfaedc8fadea4':
  mako: Update WLAN roaming configuration parameters
Report feature "android.hardware.audio.low_latency"

Bug: 4554178
Change-Id: I615995525ea652636078948623777cc65451ad3c
am 12600c2f: Report feature "android.hardware.audio.low_latency"

* commit '12600c2f5c8cba1eaf5c64ad8200554f00524d2d':
  Report feature "android.hardware.audio.low_latency"
am d5fe1142: am 12600c2f: Report feature "android.hardware.audio.low_latency"

* commit 'd5fe1142fce7605e04f4acc6af1dd8291e343e62':
  Report feature "android.hardware.audio.low_latency"
am 75b4f80c: am d5fe1142: am 12600c2f: Report feature "android.hardware.audio.low_latency"

* commit '75b4f80c05c66617e724dd569e104a451f75c586':
  Report feature "android.hardware.audio.low_latency"
Mako overlay: Remove unnecessary enableDreams in config.

Does not differ from the framework default.
Also the name is changing.

Bug:7373284
Change-Id: I4d0cecc37037f8d2d2975cb9ace1927607ef0c2a
merge in jb-mr1-release history after reset to jb-mr1-dev
am 1e0fae73: Mako overlay: Remove unnecessary enableDreams in config.

* commit '1e0fae733873ce2e497dfc693ed93eb5366610c4':
  Mako overlay: Remove unnecessary enableDreams in config.
am 59b85ba5: am 1e0fae73: Mako overlay: Remove unnecessary enableDreams in config.

* commit '59b85ba53e014402e511382532461de1e43d8177':
  Mako overlay: Remove unnecessary enableDreams in config.
am 9e6e91fb: am 59b85ba5: am 1e0fae73: Mako overlay: Remove unnecessary enableDreams in config.

* commit '9e6e91fbf32e23bccead303723f73339a0026f73':
  Mako overlay: Remove unnecessary enableDreams in config.