Merge commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b'
* commit 'cdbf5746fcbee26bed74090e22aff761d1b4da3b':
Default to UTF8 resources when packaging with aapt
Merge commit '871f9de3554ccfd2028837dea97b76fcaf5ffedb'
* commit '871f9de3554ccfd2028837dea97b76fcaf5ffedb':
fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2' into eclair-mr2
* commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2':
fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
Merge commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2' into eclair-plus-aosp
* commit 'f9b0e826689cca5ecbd40aa49f3ea7f7c73ad2a2':
fix [2269582] [TOP-10][Passion_1506][APT:Camera]Sometimes camera preview screen is truncated after launching and back to home screen by home key repeatedly
When a surface is removed from the screen while it holds a "freeze lock", the
release of that lock happens in the destructor as a "safety net". However, it
doesn't trigger an update at that point.
Make sure that "freeze locks" are released from the transaction at the point
a surface is removed from the screen (if it's not on screen, it shouldn't
prevent the screen to redraw, and therefore cannot hold a freeze lock).
The refresh corresponding to that transaction will pick it up as soon as possible.
Merge commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39'
* commit 'abcb37038a4981e935e516dd4d56cecd1f6fcb39':
fix [2315900] Monochrome camera preview screen after launching camera
Merge commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3' into eclair-mr2-plus-aosp
* commit 'b5ef7ee1644b099498ddd29c1d051e7ee26ccfd3':
Default to UTF8 resources when packaging with aapt
Merge commit '05bbeb356286bfb6ddc26ac546cce03334e346dd' into eclair-mr2-plus-aosp
* commit '05bbeb356286bfb6ddc26ac546cce03334e346dd':
Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Merge commit '024726391ad1536c5fa4af3f786141e200efed54' into eclair-mr2-plus-aosp
* commit '024726391ad1536c5fa4af3f786141e200efed54':
fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1' into eclair-mr2
* commit '7eb6ec1f44ade4c7bf3d23cbcfe29a17bbd940b1':
Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple to samples index. Also add latest samples zip file.
Merge commit '083a557c25e0032bc4900f335b6643d0badd09ce' into eclair-mr2
* commit '083a557c25e0032bc4900f335b6643d0badd09ce':
fix [2319255] crash in openGL : from the media recorder stress test.
Merge commit '9de0dba37cdb74a21e561c5235757318f1812e3d' into eclair-mr2-plus-aosp
* commit '9de0dba37cdb74a21e561c5235757318f1812e3d':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit '9472b35ba190b24f811ff7b025a93b2023dbd58d' into eclair-mr2-plus-aosp
* commit '9472b35ba190b24f811ff7b025a93b2023dbd58d':
Fix media player decode function. Bug 2317821.
Merge commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989' into eclair-mr2
* commit 'b9b45a5e26ed020a39a507a173d9f29e336cf989':
Adding screenshots for development/samples/Wiktionary and development/samples/WiktionarySimple.
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-mr2
* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
Merge commit '7b0463a949b57620680b95e45c66a05f67426b74' into eclair-mr2-plus-aosp
* commit '7b0463a949b57620680b95e45c66a05f67426b74':
docs: add the Bluetooth developer guide,
Merge commit '4d272fe9e0e6f606535ef4a297337e6272c708b4' into eclair-mr2-plus-aosp
* commit '4d272fe9e0e6f606535ef4a297337e6272c708b4':
Import revised translations. DO NOT MERGE
Merge commit '368c332ddc804d5fb0bb2362f658e7a3706fb003' into eclair-mr2-plus-aosp
* commit '368c332ddc804d5fb0bb2362f658e7a3706fb003':
Maintain a list of all Bluetooth docks.
Merge commit '75ca58d6f877541516f4f2710b4bed39fa7c4266' into eclair-mr2-plus-aosp
* commit '75ca58d6f877541516f4f2710b4bed39fa7c4266':
fix [2315900] Monochrome camera preview screen after launching camera
Merge commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379' into eclair-mr2
* commit 'ed2a70d6495b3f1928e36ad2b00ee4d33b2c0379':
docs: add the Bluetooth developer guide,
Merge commit '282a742347bcb673f278c56b4dfede328a655296' into eclair-mr2
* commit '282a742347bcb673f278c56b4dfede328a655296':
Import revised translations. DO NOT MERGE
Merge commit 'f6e32e72a902d9a309410bc5306a539ea850159f' into eclair-mr2
* commit 'f6e32e72a902d9a309410bc5306a539ea850159f':
Maintain a list of all Bluetooth docks.
Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-mr2
* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
fix [2315900] Monochrome camera preview screen after launching camera
Merge commit 'b62954b66542e3e2654d97a81123c51805bceca7'
* commit 'b62954b66542e3e2654d97a81123c51805bceca7':
Throttle low priority RS threads by sleeping once per frame to avoid starving other apps.
