Merge commit '6e0967b3c4561e188df72f478baf16c6627b12be' into kraken
* commit '6e0967b3c4561e188df72f478baf16c6627b12be':
Added the runtime parameters for the mediarecorder stress test.
Merge commit 'b0016e2b2162c916289d022f1572c0bc95158543' into froyo-plus-aosp
* commit 'b0016e2b2162c916289d022f1572c0bc95158543':
Added the runtime parameters for the mediarecorder stress test.
Merge commit '88ccecf573a52648052bc9c7858f345776f76e0e' into kraken
* commit '88ccecf573a52648052bc9c7858f345776f76e0e':
Make the NTP Cache max-age gservices-settable
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp
* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
Make the NTP Cache max-age gservices-settable
the new native_window_set_buffers_geometry allows
to specify a size and format for all buffers to be
dequeued. the buffer will be scalled to the window's
size.
Change-Id: I2c378b85c88d29cdd827a5f319d5c704d79ba381
Merge commit 'f67c874c07d2e0ff888cc88679f884a833f89870' into kraken
* commit 'f67c874c07d2e0ff888cc88679f884a833f89870':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp
* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
this method can be used to change the number of buffers
associated to a native window. the default is two.
Change-Id: I608b959e6b29d77f95edb23c31dc9b099a758f2f
this change introduces R/W locks in the right places.
on the server-side, it guarantees that setBufferCount()
is synchronized with "retire" and "resize".
on the client-side, it guarantees that setBufferCount()
is synchronized with "dequeue", "lockbuffer" and "queue"
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken
* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
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 '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 '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc' into kraken
* commit '3716ea04d9fd59ff95bacdf6efac4ab5583e13fc':
If the network SSID is a string, it should be enclosed in double quotation marks.
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 '41a254cf1b770dded24dcdb2dab6347da6dcf8bf' into kraken
* commit '41a254cf1b770dded24dcdb2dab6347da6dcf8bf':
Doc change: Add new tv to carousel.
Merge commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6' into froyo-plus-aosp
* commit 'dc737ca986ed9055b4bb39c67d470b6886522ca6':
Doc change: Add new tv to carousel.
Merge commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac' into kraken
* commit 'cf7579148a95b4875b1d5e7430fb8d6f362cefac':
docs: add youtube video to highlights
Merge commit '55f383a9b8da99aa48857fea27a35badc515d8bd' into froyo-plus-aosp
* commit '55f383a9b8da99aa48857fea27a35badc515d8bd':
docs: add youtube video to highlights
Merge commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926' into kraken
* commit '864c3d1b90ebcd3c7ae15fe57319aa19c2fe5926':
doc: add developing and testing info to backup guide
Merge commit '8025989957e5b6ad51e99a69a0e1e753e40cba67' into froyo-plus-aosp
* commit '8025989957e5b6ad51e99a69a0e1e753e40cba67':
doc: add developing and testing info to backup guide
