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.
Merge commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352' into eclair-plus-aosp
* commit 'b3b1ccfe0e8d9ea6582646a6cedb7f4669e41352':
Change these string constants back to match donut.
Merge commit '580a2921083f95e9ffd905bc31f838d683f667b4' into eclair-plus-aosp
* commit '580a2921083f95e9ffd905bc31f838d683f667b4':
Add a null check in PackageParser
Merge commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339' into eclair-plus-aosp
* commit 'aa0a3b09e7a2947130e9a98c459a63349ef2d339':
Various tweaks to try to improve low memory behavior.
Merge commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd' into eclair-plus-aosp
* commit 'bc86bda499b8600cc3dc900bba0e6421304c26dd':
Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Merge commit '25b9cec8de75bd38c4868515e611cd69aff524ca' into eclair-plus-aosp
* commit '25b9cec8de75bd38c4868515e611cd69aff524ca':
PowerManagerService: Disallow all user activity when in proximity wake lock.
Merge commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519' into eclair-plus-aosp
* commit 'e0daf8043fd4a9be995ff737d217b7b3514d4519':
An attempt to fix a deadlock between OMXCodec::start and upstream ::read
Merge commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7' into eclair-plus-aosp
* commit '6ff90cf2b3148b51e6f900e2e86bcd1a2afb26d7':
Set Routing to A2DP only when state is Connected.
Merge commit '4d5b4225e492f3de543efa195204f38d03a6721a' into eclair-plus-aosp
* commit '4d5b4225e492f3de543efa195204f38d03a6721a':
The Gservices settings for pruning messages/chats.
Merge commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4' into eclair-plus-aosp
* commit 'ed48c8081ccf82cb233cae0b4fcce98b848dc4e4':
Change fade to use a gradient from opaque color to transparent color.
Merge commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0' into eclair-plus-aosp
* commit '650b872c5aa54d94ef7a8e4a89daab11af15d5e0':
Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them...
Merge commit '49c22570bb8717bb678dbd8bae6692bb585370fc' into eclair-plus-aosp
* commit '49c22570bb8717bb678dbd8bae6692bb585370fc':
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '7566c1debebe072af76411e11d96810fd1409482' into eclair
* commit '7566c1debebe072af76411e11d96810fd1409482':
LocationManager: Fix problem replacing GPS and network providers with a mock provider.
Merge commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f' into eclair-plus-aosp
* commit '09b0ca1ceefde02b9ed50dc4dd12774ba569143f':
Sets default value of 'enableGeolocation' to true. This allows WebKit's DumpRenderTree to function correctly. Note that when Geolocation is used in the browser, this default value is overridden by the browser's default anyway.
Merge commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e' into eclair-plus-aosp
* commit '7537e3dc9106ad5a4ac06dace3e26ebb341dee8e':
Sets or clears Geolocation permissions for Google origins when the 'Location & privacy - Share with Google' sysetm setting is changed.