Merge commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50' into eclair-plus-aosp
* commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50':
Armor string format tokens with translation placeholders.
Merge commit '0d430593ee07b78894eff8b78f559d2591a94287' into eclair-plus-aosp
* commit '0d430593ee07b78894eff8b78f559d2591a94287':
Launch synthesis thread at max priority to prevent hicups in playback.
* changes:
Launch synthesis thread at max priority to prevent hicups in playback. Return and log an error when an operation cannot be completed because the speech queue is locked longer than the timeout period. Log cleanup.
Merge commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4' into eclair-plus-aosp
* commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4':
don't layout when setting size from zoom if only height changed
Merge commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496' into eclair-plus-aosp
* commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496':
Only add model in the UA for the release build
Merge commit 'c035f7c79fda9474002d265175fc52692dbd78fe' into eclair-plus-aosp
* commit 'c035f7c79fda9474002d265175fc52692dbd78fe':
Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2' into eclair-plus-aosp
* commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2':
Revert "Remove third party support for Quick Search Box (aka global search)."
Merge commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6' into eclair-plus-aosp
* commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6':
add an accessor for Context for use by subclasses
* Other changes
+ Re-assign err codes in VpnManager.
+ Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
+ Delete the state file only if it exists (to prevent logging an
unable-to-unlink error).
+ Extend timeout to 40 seconds.
Merge commit '1005569fbb459007ff9d9fddbfa6e49947166166' into eclair-plus-aosp
* commit '1005569fbb459007ff9d9fddbfa6e49947166166':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp
* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
Apparently setting the preferred role of the OMX component is now required on this platform.
Merge commit 'bfa1d083aac92a8fc315e18a381287108b138baf' into eclair-plus-aosp
* commit 'bfa1d083aac92a8fc315e18a381287108b138baf':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
Merge commit 'c1dccce74104c5ababb1118fda3ea43974adbad4' into eclair-plus-aosp
* commit 'c1dccce74104c5ababb1118fda3ea43974adbad4':
Squashed commit of the following:
Merge commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5' into eclair-plus-aosp
* commit 'd6ac7c73e17f0ce0cc3b1290760c4f67cafcdec5':
Fix issue #2069662: The wallpaper doesn't move along with the home screen
Merge commit 'fa5260290f3c19988c292f21845a948374c3c31d' into eclair-plus-aosp
* commit 'fa5260290f3c19988c292f21845a948374c3c31d':
Final Donut API list.
Merge commit '6391830d103ccb19465c69660065c22c2711dcfd' into eclair-plus-aosp
* commit '6391830d103ccb19465c69660065c22c2711dcfd':
Don't activate keyguard if screen is turned off while proximity sensor is active.
Merge commit '18ad9f657bda79069233c0b8e1476888ffd894d4' into eclair-plus-aosp
* commit '18ad9f657bda79069233c0b8e1476888ffd894d4':
Only allow system code to call LocationManager.sendNiResponse()
Merge commit '0409cde3601131caf14c88d132c65d74774bbd79' into eclair-plus-aosp
* commit '0409cde3601131caf14c88d132c65d74774bbd79':
Updating synchronized to match x-net changes
Merge commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56' into eclair-plus-aosp
* commit '1e0f7627389a18d7a2ea74d7a5fb2c251de56a56':
Make SINGLE_TOP work with CLEAR_TOP.
Merge commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851' into eclair-plus-aosp
* commit 'e18d4d01152071f3a489a0d3077ad89dfa1f3851':
Extend stagefright commandline up to enable vendor to reproduce specific bugs filed.
