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
Merge commit '6d9eebe7320637f0256c077ba5ed6724b5a4ab0d' into eclair-plus-aosp
* commit '6d9eebe7320637f0256c077ba5ed6724b5a4ab0d':
Move backlight brightness from HardwareService to PowerManager
Merge commit '0ae011b6f6d709d840f60f25df2046c9545a10a2' into eclair-plus-aosp
* commit '0ae011b6f6d709d840f60f25df2046c9545a10a2':
change to use the new CALLER_IS_SYNCADAPTER flag
Merge commit '74a0b8209e0228bb48739a4b25e489e2eba2a2c4' into eclair-plus-aosp
* commit '74a0b8209e0228bb48739a4b25e489e2eba2a2c4':
DockObserver wakes the display when broadcasting a change
Merge commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2' into eclair-plus-aosp
* commit '1cd403eaac24e0e84619dea07e2d1d60e58e1fd2':
Add SurfaceView API to put surface on top of window.
Merge commit '70f74b79c3e4c88e0e7b747796f76187e4ea8259' into eclair-plus-aosp
* commit '70f74b79c3e4c88e0e7b747796f76187e4ea8259':
Assemble WAP datagram correctly when segments arrive out of order
Merge commit 'db6d939d2bbf457b1caa5479a60dae5e90d023e1' into eclair-plus-aosp
* commit 'db6d939d2bbf457b1caa5479a60dae5e90d023e1':
if the cursor and focus don't match, match them on text view clicks
Merge commit 'df344375a93f3bfe0360f5436c0866f44b7fb6cc' into eclair-plus-aosp
* commit 'df344375a93f3bfe0360f5436c0866f44b7fb6cc':
compute Y scroll max by scaling only, ignoring title bar height
