Merge commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651' into eclair-plus-aosp
* commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651':
At leaset log the layout test timeouts
Merge commit '169ae05f9f5cce400dd936e2a31676b80d84b862' into eclair-plus-aosp
* commit '169ae05f9f5cce400dd936e2a31676b80d84b862':
if exception getMessage() is null, don't add it to the error
Merge commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030' into eclair-plus-aosp
* commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030':
When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
* changes:
When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
Merge commit '05a6f3cde52e5fbbad5187615bfc87d58559161f' into eclair-plus-aosp
* commit '05a6f3cde52e5fbbad5187615bfc87d58559161f':
Fix a docs comment to match the parameter name.
In AudioFlinger::MixerThread::putTracks(), change the mFillingUpStatus flag to FS_FILLING for active tracks so that mute request is executed without ramping volume down when the track is moved from A2DP to hardware output.
Also modified AudioFlinger::setStreamOutput() so that the notification of the change is sent only once to AudioSystem.
Merge commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c' into eclair-plus-aosp
* commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c':
Fix the documentation for onReceivedError.
Merge commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb' into eclair-plus-aosp
* commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb':
Moves GoogleLocationSettingManager to its correct location.
Merge commit '84c4548d046c7426cd346602cec18b98fdcdbf3c' into eclair-plus-aosp
* commit '84c4548d046c7426cd346602cec18b98fdcdbf3c':
LocationManagerService: Remove caching of last known locations to flash.
LocationManagerService: Add null pointer check and remove useless finalize() method.
Merge commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8' into eclair-plus-aosp
* commit 'c98d68cd56338ec57695b3c35114fbde88d4bde8':
Move SMS pdu creation fully into the central Phone process.
* changes:
LocationManagerService: Remove caching of last known locations to flash.
LocationManagerService: Add null pointer check and remove useless finalize() method.
Merge commit 'ce54003aa8961764763c4045991b730974fa9083' into eclair-plus-aosp
* commit 'ce54003aa8961764763c4045991b730974fa9083':
allow a longer timeout for layout tests, see if it stabilizes pass/fail numbers
Merge commit '95434bfaee62161ce02012c6424f0c0c8fffccb5' into eclair-plus-aosp
* commit '95434bfaee62161ce02012c6424f0c0c8fffccb5':
Allow fragmentText to be called for singleton CDMA messages.
Merge commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91' into eclair-plus-aosp
* commit '34b6a27ea38adeea54a488efc6bbd04c58cb8a91':
re-enable cancelation of the sync thread upon receipt of ISyncAdapter.cancelSync()
Merge commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7' into eclair-plus-aosp
* commit 'e23ef1023a4e4bd91a68c41c81ba273656a2c3a7':
Add error output to pm for FAILED_MISSING_FEATURE
Merge commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2' into eclair-plus-aosp
* commit '0f44220b34e346ef333cdb4cd4b4903b5212dad2':
Prevent ListView from scrolling/flinging its content when the content fits on screen.
Merge commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00' into eclair-plus-aosp
* commit 'ec5d9fb47d180d84e3eff0b2138966579be6ac00':
Revert "- don't schedule syncs that we will never dispatch"
Merge commit 'c91ad28ff9173971c1d886f884250b1e774a40a6' into eclair-plus-aosp
* commit 'c91ad28ff9173971c1d886f884250b1e774a40a6':
Fix property being cleared when DeviceFound signal is received.
Merge commit 'bf1071c07979b03a9f5e8281aba82ed05513185e' into eclair-plus-aosp
* commit 'bf1071c07979b03a9f5e8281aba82ed05513185e':
Temporarily unlock our mutex while fetching a buffer from the upstream source.
Merge commit '450ff8a48c9b78729332c99d680560b583f17e7d' into eclair-plus-aosp
* commit '450ff8a48c9b78729332c99d680560b583f17e7d':
Fix double-free problem in EmojiFactory.
Merge commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3' into eclair-plus-aosp
* commit '6896aef0bd3132a64cfdee6c1276c4bbbb25d8e3':
Clean TTS logs: use a common TAG in the TTS service, don't show
