Merge commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6' into kraken
* commit 'd06c435c3f520ef2012fdd331dac76b1621a72e6':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Merge commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a' into froyo-plus-aosp
* commit 'c6c8a1e96f2cccb7b2bf7aec5140a3eacb7a922a':
Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection.
Merge commit 'a327dbddccb002919b98bdfd7abd81619826a3b8' into kraken
* commit 'a327dbddccb002919b98bdfd7abd81619826a3b8':
Fix issue #2541849: System crash when an app with active notifications...
Merge commit 'ecb0e637870553f9c12dc6b9178de0512563af9c' into froyo-plus-aosp
* commit 'ecb0e637870553f9c12dc6b9178de0512563af9c':
Fix issue #2541849: System crash when an app with active notifications...
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken
* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
Update API and javadoc according to API review.
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp
* commit '3f4639a6611222ae1ae5493de49213250d292139':
Update API and javadoc according to API review.
Merge commit '822a7e2defcfbd006a7840e1da19cf0827d46736' into kraken
* commit '822a7e2defcfbd006a7840e1da19cf0827d46736':
Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d' into froyo-plus-aosp
* commit 'ce59fb8b684357f2a10ab62368beeece34bc0e5d':
Fix issue #2578244: playing audio file downloaded by the browser...
Merge commit '520d684093b50c25d06aac652ad4bca42ff7e862' into kraken
* commit '520d684093b50c25d06aac652ad4bca42ff7e862':
Revert "Use the content width to calculate the zoom overview"
Merge commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7' into froyo-plus-aosp
* commit '667543cdb5aad1dc7ef567d57d34f1ac975b02a7':
Revert "Use the content width to calculate the zoom overview"
Merge commit '692329cf3f1512b3f0475b619058f9a10d9950a8' into kraken
* commit '692329cf3f1512b3f0475b619058f9a10d9950a8':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Merge commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85' into froyo-plus-aosp
* commit 'fd998a0caf8cfcd27d1fe73120fbb897ec74af85':
NetworkManagementService: Remove 'maxkbs' parameter from throttle API
Merge commit '560607ca530d88869ac87e5875de7efdcd0f7b85' into kraken
* commit '560607ca530d88869ac87e5875de7efdcd0f7b85':
Add Backup/Restore sample to the SDK docs
Merge commit '98e26575373461dc16c749d1f756403e46a909d4' into froyo-plus-aosp
* commit '98e26575373461dc16c749d1f756403e46a909d4':
Add Backup/Restore sample to the SDK docs
Merge commit 'ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken
* commit 'ca9a083bcf1ad753812e14f506c210a2104342c5':
Don't check whether a specific named activity supports mp3 playback,
Merge commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda' into froyo-plus-aosp
* commit 'e43e563e73ab6b1af2b3276a4917976b112f5cda':
Don't check whether a specific named activity supports mp3 playback,
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken
* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp
* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken
* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Merge commit '03e352a2850d74cee11d3f0734938efb22cac351' into kraken
* commit '03e352a2850d74cee11d3f0734938efb22cac351':
Fix issue #2576268: There is no uiMode config change constant for the manifest
