Merge branch 'master' into honeycomb-release
Fix SCO audio not playing twice.

Fix output stream stanby() function that was clearing the bluetooth device flag.
As this flag is not restored when the output stream is reactivated
(unless a device change occurs), the next write after the output was placed into
standby resulted in continuous write errors from the driver.

Change-Id: Ic678062cd7ab451a3c3420e4f4260030fdd7085d
Specify a value for -Xms with the new dalvik.vm.heapstartsize property.

Change-Id: I945b456c53c7fb1a254c6e286a93b6b2c72f9d93
Merge "Specify a value for -Xms with the new dalvik.vm.heapstartsize property."
Merge branch 'master' into honeycomb-release
Revert "stingray: update prebuilt kernel/wifi"

This reverts commit 33346cde3dda401bc97b722edd705239d00e70f2.
Small bump to heap size until we get the final larger one in.

Change-Id: Ia70fdfd4ca9cf722f93b59aa78980abcb01df845
Merge "Small bump to heap size until we get the final larger one in."
Merge remote branch 'goog/master' into honeycomb-release
Enable baud rate setting to be used for downloading BT firmware.

Change-Id: I985609f29fa8171049e0417e1b567389e41ce7e1
Stingray: require bootloader 1026 and radio 020A.

Change-Id: I6b360f505b34dbb9353c194f861bc8c75fab5455
Signed-off-by: Paul Eastham <eastham@google.com>
Merge branch 'master' into honeycomb-release
stingray: libaudio: Reduce EC/NS thread scheduling jitter

After running EC/NS algorithm and writing the downlink speech,
there is typically one full read buffer available.  Read this
buffer before signaling the "read thread" so that we don't
get scheduled out and overflow the buffer.

Also bump the EC/NS thread priority to HIGHEST.

Change-Id: I07f19ca6cd5126f48911b99127bc223c2ba4ad79
stingray: update prebuit kernel/wifi

This includes the kernel history thrown out by the previous revert.

d68fe8f [ARM] mfd: cpcap:  Reduce audio dock pops
76bf6ee Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
42907f1 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
2bc50e6 Merge branch 'android-2.6.36' into android-tegra-2.6.36
85f7f64 media: video: tegra: avp_svc: Force memory bus to full when avp is enabl
a1243f6 video: tegra: dc: Force memory bus to full when display is enabled
94ef9a6 ARM: tegra: cpufreq: Adjust memory frequency with cpu frequency
a4c4c83 ARM: tegra: dvfs: Add emc clock to dvfs table
7312d0e ARM: tegra: clocks: Add emc scaling
931788a ARM: tegra: Add external memory controller driver
a8f0558 ARM: tegra: clock: Round rate before dvfs
415c429 Revert "futex: Restore one of the fast paths eliminated by 38d47c1b7075b
0cff1ca [ARM] tegra: stingray: Add callback to indicate rx is done.
79b6dbe media: video: tegra: ov5650: adding group hold
654859f Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto
06f7cee Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
0c31cbc net: wireless: bcm4329: Add CONFIG_FIRST_SCAN option
202e4ad Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto
9ef004d Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
0e3fe9b video: tegra: nvmap: Clear handle->owner on release
c0132a6 video: tegra: nvmap: Fix per client accounting
63727fd Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
5b08d08 Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
8df654e Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
d65dc80 [ARM] tegra: spdif/i2s audio: fixes
5556e08 [ARM] tegra: stingray: Add optional low power mode callbacks.
5f0482d [ARM] tegra: enable led pwm mode for p3+ stingray
97bcb59 misc: kxtf9: Return success in resume if no enable necessary.
330864b mdm6600: Workqueue worker missing synchronization
4d9275d tegra: video: host: remove cancelled actions at power down
9383458 tegra: video: host: reset syncpoints on host initialization
5804531 video: tegra: host: Added nvhost resume.
38c55fa video: tegra: nvmap: Fix per client accounting
80824fb [ARM] tegra: ventana: fix gpio key for menu options
e1f65c5 regulator: tps6586x: Handle both enable reg/bits being the same
07e159f regulator: tps6586x: correct register table
30e9d11 regulator: tps6586x: Add missing bit mask generation
6ea91c8 regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
cd1bc93 Revert "usb: host: tegra: Remove programing PTC bits based on bus speed.
b01b677 [ARM] tegra: cpufreq: Support for tegra cpu throttling
10a8f4d usb: gadget: Multiple ACM gadget instances
8da1d5c usb: gadget: Fixed Android gadget function discovery & product matching

Change-Id: If7adc4f4eeac6be159d271a7d458f978117ff5a7
Signed-off-by: Iliyan Malchev <malchev@google.com>
Set config_sms_capable false for Stingray.

For bug 3250029.

Change-Id: Ia29b8f9a5833e4ff378f156d47c75dc1601a94a5
Fix issue 3060774

Implement microphone mute by clearing audio buffer after reading from kernel
and applying EC/NS if activated.
This option is not optimal with regard to performance but allows keeping accurate
audio input clock sync and avoids glitches on audio output due to EC/NS reconfiguration.

Change-Id: I619f2318eb1bd598db20e40fe5bfc1327b7fdc09
stingray: libaudio: Swap rate converters

Use a new rate converter for improved quality and MCPS

Change-Id: I5add1affe82216a8bfdd3651150eb15ef9197da6
Signed-off-by: Iliyan Malchev <malchev@google.com>
Merge branch 'master' into honeycomb-release
Set MTP reserve space to 100 megabytes

This will prevent MTP from getting the device into a severe low storage situation

BUG: 3250924

Change-Id: Iba2a7a402c1e7b985ca79abbc20578f76ad44bcb
Signed-off-by: Mike Lockwood <lockwood@android.com>
Stingray kernel/wlan prebuilts

b26b14ee87f00806ef24a0d7442d5ef9c7fd8531 Revert "usb: core: Temporary workaround for usb auto-suspend i
c222692e18209aaa913975e8f422ece6f52ee628 [ARM] configs: Turn on SHA256 hashing.
779edf5b4e01775ea996d7b8220d55c365e5ed9d [ARM] configs: Change stingray_defconfig to a proper minimal d
7e4176fdd16daec461a479d51add513c065db2ec ARM: tegra: stingray: fix defconfig warning
d001b9c9518f18135486ddef74422d231a352a62 ARM: tegra: stingray: add newlines to gps log msgs

Change-Id: Ie976e8a5242ad7c371d76b2b721ebd5566ed3ad9