Merge commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8' into eclair-plus-aosp
* commit '7c3e493d7b2db7f28d6fdb52d79c4d99ef1502b8':
Fix for #2092883: Allow manual sync even when background data is disabled
Merge commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc' into eclair-plus-aosp
* commit 'e74050a9ca248eb6a8d3d8fc2d7712b340afddcc':
Allow only System Service to send most Bluetooth intents.
Merge commit '5446ea77bcd7cf3d234f7198d073c99f6519662f' into eclair-plus-aosp
* commit '5446ea77bcd7cf3d234f7198d073c99f6519662f':
fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
Merge commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb' into eclair-plus-aosp
* commit '4e54f3309ec9dac3cf69ffa73ec7c5378f19dffb':
update for new plugin api
Merge commit '64ce0f8f5315e3a364aea047360520b097e7a7cd' into eclair-plus-aosp
* commit '64ce0f8f5315e3a364aea047360520b097e7a7cd':
First pass at replacing native plugin views with java.
Merge commit 'b6a7ea540ef9537bcedc707a87514e63438a533a' into eclair-plus-aosp
* commit 'b6a7ea540ef9537bcedc707a87514e63438a533a':
Reconcile the character popups for the hard and soft keyboards.
Merge commit '9c39c6d02fc31e18f3abafb89cc29520cb539cb8' into eclair-plus-aosp
* commit '9c39c6d02fc31e18f3abafb89cc29520cb539cb8':
Build the BitmapShader if it hasn't been built yet.
Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp
* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
Merge commit '90142c959e6de38eae1563cd8b3d2d448393e15f' into eclair-plus-aosp
* commit '90142c959e6de38eae1563cd8b3d2d448393e15f':
Adding a system property to log slow queries
Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp
* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp
* commit '0edada085e175e81b6d38a48b5b022917b410a98':
Added an API IOMX::createRendererFromJavaSurface.
Merge commit '617d470dffdc0b5fa24454b0e07438ad0f4721f9' into eclair-plus-aosp
* commit '617d470dffdc0b5fa24454b0e07438ad0f4721f9':
Add more error message if the script failed to pull result file from device.
Merge commit '7bd660012ca5d946f4f4efb9d357a785e6a4d4eb' into eclair-plus-aosp
* commit '7bd660012ca5d946f4f4efb9d357a785e6a4d4eb':
Preserve ListView's pressed state when the adapter changes its content while the user is pressing an item.
* changes:
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
Merge commit 'df4cf29715146d67306595108c565d9848a6ae1a' into eclair-plus-aosp
* commit 'df4cf29715146d67306595108c565d9848a6ae1a':
redraw once more on a touch-up if we've been dragging, so we can redraw in high-quality mode
