Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp
* commit '9d5fac517463526450268bf6353e32c13a8cdd0c':
fix small bug in EGL error management
1: index set size was populated with bad value in java,
2: bad error check in uploadToBufferObject.
Change-Id: I5946053cdfba0b2fbbaa34d562a9ec53e26ce9f2
Merge commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e'
* commit 'cc6b941cf01994c04b5e1f92b0860be8e2abc50e':
Make sure we drain the avc software decoder's output queue once we run out of input data.
Merge commit 'f78fdaccde379d1c101be137416808ea62a2f292'
* commit 'f78fdaccde379d1c101be137416808ea62a2f292':
Fix problem where Base64InputStream single-byte reads were unsigned.
There is a need to skip registering the observer
or register a different observer in cases when
we have an extremely chatty content provider
(think MediaStore).
Change-Id: Iadfb8e0193736cb231762a147c2df1491ad22e0e
Merge commit '4374b23d6be406710b91be746229e6c548613410' into gingerbread-plus-aosp
* commit '4374b23d6be406710b91be746229e6c548613410':
Make sure we drain the avc software decoder's output queue once we run out of input data.
Merge commit '2359d49b80df13c1724c7c6da5648f17a33d881a' into gingerbread-plus-aosp
* commit '2359d49b80df13c1724c7c6da5648f17a33d881a':
DO NOT MERGE - redo Ib5e519fb40d3191ecac06c03a844872df19f3963
Merge commit 'eaa2cabf342e973925fb223104f9971deae27b17' into gingerbread-plus-aosp
* commit 'eaa2cabf342e973925fb223104f9971deae27b17':
Fix problem where Base64InputStream single-byte reads were unsigned.
Merge commit 'ada0deb4c295f18add04a474c2b396c87b0bee09'
* commit 'ada0deb4c295f18add04a474c2b396c87b0bee09':
Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
Merge commit '1a29d8361a03597115a998cc15860791f8ddd503'
* commit '1a29d8361a03597115a998cc15860791f8ddd503':
Make sure we drain the avc software decoder's output queue once we run out of input data.
Merge commit 'f5a8f2f4634e4fffbb20c66fa37980d0599a27f1' into gingerbread-plus-aosp
* commit 'f5a8f2f4634e4fffbb20c66fa37980d0599a27f1':
Raise the amount of memory set aside for omx buffer allocations in the test harness to accomodate the new requirements of some codecs.
Merge commit '18f196a19eb93c8b309c8a3e2093ce4400708348'
* commit '18f196a19eb93c8b309c8a3e2093ce4400708348':
(do not merge)hide videochat changes in gingerbread. bug:3001483
Merge commit '31e323e6c874e6f306e7f35a22350750b23b06de' into gingerbread-plus-aosp
* commit '31e323e6c874e6f306e7f35a22350750b23b06de':
Make sure we drain the avc software decoder's output queue once we run out of input data.
Merge commit '9e1266da66a39c0a4994c7224236d103aa6536eb' into gingerbread-plus-aosp
* commit '9e1266da66a39c0a4994c7224236d103aa6536eb': (1565 commits)
(do not merge)hide videochat changes in gingerbread. bug:3001483
Fix a bug in DumpRenderTree2's run_apache2.py script
Fix DumpRenderTree2 to make AbstractResult serializable
Fix DumpRenderTree2 to handle SSL errors
Work on fragments in layouts.
Text selection anchors changed to use windows
Add support for circular gradients to the GL renderer.
cherry pick "Fix build" a227db53f0cd30214c393b400436d1e0863396ef into master
Test use of "f" suffix on float initializers.
Detect and throw exception for using
bring database code in master for 'adb bugreport' in sync with ginger
Make the reading level scale at least 0.5f apart from overview level.
Make the breadcrumbs touchable for navigation.
Added the behavior paramter to transition constructors
recovery just takes a filename as an argument now
Updated RSTest to test primitive type assignments.
STOPSHIP follow up to Change-Id: I392875b62ed270741633f5bffa519932e4a9f985
add new param to device config properties: db connection pool size
fix [3018216] UI shrinks / stretches while using apps with IME
Modifying PendingIntent APIs for collection widgets
...
Merge commit '32371695daf917701f78a86224b58bfda0381e27' into gingerbread-plus-aosp
* commit '32371695daf917701f78a86224b58bfda0381e27':
GpsLocationProvider: Fix race condition while bringing up APN for SUPL.
