am 58d6b9eb: (-s ours) am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '58d6b9eb20a9805ea7cecff1df01259e8a2ce1d4':
am 80f5b040: audio policy: fix music glitch when starting call

* commit '80f5b0400f86d49e70aa1a793b34f34492f005bc':
  audio policy: fix music glitch when starting call
am 5a950c96: audio policy: reuse direct output when possible

* commit '5a950c960cd40648cc3ab8defe817f88e0a7ecf4':
  audio policy: reuse direct output when possible
am e5d72df1: Add liblog

* commit 'e5d72df1f1107653627674347475c7cbcc4bf8ba':
  Add liblog
am a776ffd2: Rewrite an invalid config file

* commit 'a776ffd243bbd02948ebefd43f4ac2690ebb11e6':
  Rewrite an invalid config file
am 66707435: audio policy: fix device selection in startInput()

* commit '66707435156d8d99d795271a7bd54943065b4c2d':
  audio policy: fix device selection in startInput()
wifi: Use wpa_ctrl_cleanup() function from wpa_supplicant

Change-Id: I24af9ec380e138f24864cd9359c6901b8b29e5ee
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
wifi: Add command buffer length parameter to wifi_command()

Change-Id: I832bc51279e0fb7d3002298f87a35b816b666ad5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
wifi: Use global control socket

Change-Id: I11e4438ec0b36575e1b5a563ac4da57303d028c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
wifi: Skip adding interface prefix if exists

Bug: 9313188

Change-Id: I63784493c84ac4ffcc9810a7798b1c0de1b0f68b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
wifi: Move common file from wpa_supplicant_lib

Change-Id: I902f864da4317fd637fbc31036133c49a8ae0724
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Use accessor to read property serial numbers

Hide the implementation of the property structures by using
an accessor.

Change-Id: Ic604935882f6085e3d082baa651bad9bafe0a54a
Use accessor to read property serial numbers

Hide the implementation of the property structures by using
an accessor.

(cherry picked from commit 14c02f245e56687b765487d25a034d71196d33b6)

Change-Id: Id86ff99d8430fa73bbc745aaa0ff2b7713ca7885
Merge "Use accessor to read property serial numbers"
am 2769ce79: Merge "Use accessor to read property serial numbers"

* commit '2769ce79def80023e454708deec176e3259dc586':
  Use accessor to read property serial numbers
am 248c9aa9: am 2769ce79: Merge "Use accessor to read property serial numbers"

* commit '248c9aa92c8f3e2f33a0e8a02436ea366266495f':
  Use accessor to read property serial numbers
Add audio policy API changes for audio offload

Changes to the API of audio policy for audio offload support:
- Add isOffloadSupported() function
- Add OUTPUT_FLAG_OFFLOAD
- Extend AudioOutputDescriptor to include a sharing count for direct outputs
- Pass audio_offload_info_t when opening output streams

Change-Id: I5ad26418fdb286eb7ae299d586dd1fd525d48ab9
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
Include header files used by this header

Change-Id: I36c6f580c698706b961150978e2124f9235eab12
wifi: Sync with wpa_supplicant commit 1075b29

Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
am e92d6238: audio policy: apply default device volume

* commit 'e92d623811f3fd3e7cc5e5dd8bc93c0c0a8fdf50':
  audio policy: apply default device volume