Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp
* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
Added the runtime parameters for the mediarecorder stress test.
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp
* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp
* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
If the network SSID is a string, it should be enclosed in double quotation marks.
Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp
* commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6':
Doc change: Add new tv to carousel.
Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp
* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
docs: add youtube video to highlights
Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp
* commit '8025989957e5b6ad51e99a69a0e1e753e40cba67':
doc: add developing and testing info to backup guide
Merge commit '44108b54543c87e2c46a6d5d4339b3c4e06373de' into froyo-plus-aosp
* commit '44108b54543c87e2c46a6d5d4339b3c4e06373de':
Doc change: Move framework api change info higher in platform notes documents.
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp
* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
Uncomment a test that was marked as STOPSHIP
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: Iaa78a91e78d27f5c982218cc55e81702f1610ab2
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp
* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
docs: revise webview description and add info for targeting screen densities
Merge commit '6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp
* commit '6750bb7f838b15ef25544d7aa66b17119fcd7227':
Doc change: add link to source.android.com
