Merge cm 'branch cm-11.0' into cm-11.0
Merge commit '5b3cd060fa61821828b55060d9ef5d061006f4af' into cm-11.0
Merge commit '8db53270733939a81e5fdda89de3c8c0eaf939e4' into cm-11.0
hal: Correct the V/I feedback PCM device for 8974

 * This got moved around after merging multisession Listen.

Change-Id: I3dcc1f1ccf1373819dcbfa296dcf781f66bae9af
Merge commit '957c3d94bf34da538b3cd296e17b94a9206fd8d1' into cm-11.0
Merge commit 'd5f77aaca5e18f8dd7126749ecd39becc145e0d0' into cm-11.0
Merge commit 'd62adde8f9ff10a59e174650e82dcfc301968c0a' into cm-11.0
audio/msm7630: Introduce LowPowerAudio.

Change-Id: I77cadf3c028bc9dead0b0887c308f7394d4b14f2
audio/msm7630: Add support for audio effects for LPA clips

Add support for audio effects for LPA clips on msm7630

(cherry picked from commit 176dd4c4f0a926fd463cf2d4cf1051327a75598b)

Conflicts:

	msm7630/AudioHardware.cpp

Change-Id: Ibfa9376dae14bc772fa0cb90e2bae3309a684fc8
7x30 : Port heap mask change to ion

-mp3 clips fails to play intermittently.
-ION fails to register with the driver.
-Heap mask field passes as argument at allocation
time to specify ion heap.

CRs-Fixed: 444197

Change-Id: I35b7f162c906b856b7b4f5ee2270cd10256144bf
msm7x30: Add missing get_supported_devices in HW HAL

Change-Id: Idb90528899ae3d5a6d037f1af0544225faa02cc6
msm7x30: Fix routing for all AudioSessionOut types

 * Pass the new output device around so that we're not always just using
   the one in the base class. This was preventing proper routing for
   all output streams.

Change-Id: I07a6bf4cf15c7b6bea310c2cd593ca494a89ca5f
audio/msm7630: Add latency support for LPA

-Audio loss for few seconds on headset connection.
-Stream is unmute in checkDeviceMuteStrategies before device switch
occurs.
-Increase delay in tempMute to ensure unmuting happens after device
switch happens. Also change latency for LPA to correct value similar
to that of hpcm.

Change-Id: I539a4726f6b9d53bbfdc5f92a8801d5f14c360eb
CRs-Fixed: 448355
audio/msm7630 : Stability issue with LPA play back.

- ANR is observed during LPA playback when there is song switch for
  every few seconds
- The song switch does not happen when the song is played till the end
- Native crashes are observed during rapid seek, next and previous
  song switch operations. There is some race condition between write and
  flush which results in adding a buffer multiple times to empty queue.
  This tries to free the buffer multiple times during reset and results
  in native crash. Fix this issue by adding proper mutex in write and
  flush calls which synchronizes these operations and avoids crashes.
  After Pausetimeout, reset is called due to which EOS is posted
  to observer. This results in start or reset operation on a closed
  sink leading to crashes. Avoid posting EOS if reset is already
  called.

Change-Id: Ie171d86f39fc4484710002c4940496dc90fbb05a
CRs-Fixed: 463272
msm7x30: Update device API

Change-Id: I15bd511c3b753dc4ce076a482095e675f601c1ec
msm7x30: Fixup ifdefs so LPA playback works

Change-Id: Ia389f2c3905ba5062933912150b856e3464c2e13
Merge from ADC and add gitignore
Merge commit 'b346eb4657b5b05fa74b560cab45e9ec87e94531' into cm-11.0
hal: Add path for VR headset

 * Needed to keep Listen from derping.
 * Just point to regular headset device by default.

Change-Id: I64975c196fcb5f2b32d34d54ba01a0d73a90db4f
Merge commit '175502ea6b9c6aedc52c431b17ab7d822709b2c7' into cm-11.0