Merge commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a' into eclair-mr2-plus-aosp
* commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a':
Note to self: Don't reverse the arguments to fseek(o)...
Merge commit '10c1dfad63ee7dace03b7914faf3c9891d096e25' into eclair-mr2-plus-aosp
* commit '10c1dfad63ee7dace03b7914faf3c9891d096e25':
Move the emergency call button to the top-right when there's no SIM.
Merge commit '51ef573a8336c637ac508c49b84b512d8f11fa3a' into eclair-mr2-plus-aosp
* commit '51ef573a8336c637ac508c49b84b512d8f11fa3a':
Switching from activity based full screen plugins to a view system overlay.
Merge commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad' into eclair-mr2-plus-aosp
* commit '7e42e8f33446107d6abcbb69f4624abf1bba5fad':
Updating list of standard Intents in android.content.Intent
Merge commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43' into eclair-mr2-plus-aosp
* commit 'ebc7799444ccd4d34863f1a07e885ca423a49c43':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '0766b2d0f398dcad10e332b695bbc0cbe5011882' into eclair-mr2-plus-aosp
* commit '0766b2d0f398dcad10e332b695bbc0cbe5011882':
Update service example code.
Merge commit '259e3384face72ea8e30696d7bae492d37d44e8b' into eclair-mr2-plus-aosp
* commit '259e3384face72ea8e30696d7bae492d37d44e8b':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99' into eclair-mr2-plus-aosp
* commit '18ff0e329b314e033e4bfb92b24ecab961f0eb99':
remove an old STOPSHIP comment
Merge commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b' into eclair-mr2
* commit 'd59fb6e7435b57d83662b196f5430e6f2bc5427b':
Updating list of standard Intents in android.content.Intent
Merge commit '9c79938d47a3caa06e5fb956955374f30c55992b' into eclair-mr2
* commit '9c79938d47a3caa06e5fb956955374f30c55992b':
Document that some parameters will not be null and fix getSupportedPictureFormats.
Merge commit '7e90005fcb95d4c20c92e915f4418b94341dda36' into eclair-mr2
* commit '7e90005fcb95d4c20c92e915f4418b94341dda36':
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Merge commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24' into eclair-mr2
* commit '1067c3cbab73a4bc75a2ebd2e3c51077db96fa24':
remove an old STOPSHIP comment
Merge commit 'b08170ad7e4ca4908852b0e20759ea740b338a03' into eclair-mr2-plus-aosp
* commit 'b08170ad7e4ca4908852b0e20759ea740b338a03':
Add API to get Active Sinks.
Merge commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff' into eclair-mr2
* commit 'ae88e2d130a4d69bdf7ddc58f6ae512ea63087ff':
Add API to get Active Sinks.
Merge commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3' into eclair-mr2-plus-aosp
* commit '54a4a66d38eff838d6d1fb3d0ede203aceb750c3':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '47cc8112c3f77637ef408ef18e48d146e8250a27' into eclair-mr2-plus-aosp
* commit '47cc8112c3f77637ef408ef18e48d146e8250a27':
Fix updating Bluetooth icon on status bar and for Wifi.
Merge commit '9ae9763b7e5dd872619b13c889b72b0df176f956' into eclair-mr2
* commit '9ae9763b7e5dd872619b13c889b72b0df176f956':
DO NOT MERGE Reverting change I53e91db7.
Merge commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564' into eclair-mr2
* commit '9d3cb9bfc6d7a5f340d2dd8132b201b933687564':
Fix updating Bluetooth icon on status bar and for Wifi.
Merge commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4' into eclair-mr2-plus-aosp
* commit '096871e7e1a1f8cdfbaa1acc4bc485b69ddf22a4':
Filter out minor Connectivity Notifications.
Merge commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3' into eclair-mr2
* commit '90d1b745ec4a7ccd15cdcc185420bf2000b4f7a3':
Filter out minor Connectivity Notifications.
Merge commit '6be01bf207077ffbdcd3879250171a26ec805835' into eclair-mr2-plus-aosp
* commit '6be01bf207077ffbdcd3879250171a26ec805835':
Revert "dealloc compiled-sql statements before deref'ing them from SQLiteDatabase obj."
Merge commit '247003be9ea69928e35ce2f1bd1fab652920a3f2' into eclair-mr2-plus-aosp
* commit '247003be9ea69928e35ce2f1bd1fab652920a3f2':
Initial checkin of stagefright MP3 audio decoder based on PV source code.
Merge commit '6761e85d41dedf4e783217922a5fedac2b7a654d' into eclair-mr2-plus-aosp
* commit '6761e85d41dedf4e783217922a5fedac2b7a654d':
Set InputType of WebTextView according to <input> field's type.
Merge commit 'ddcea3d21645bb3037703c84807dae077aae62ce' into eclair-mr2-plus-aosp
* commit 'ddcea3d21645bb3037703c84807dae077aae62ce':
Expose onReceivedSslError() so that the WebView client
Merge commit '14467eb2eea119b4d71dd7dd149479aa092e6de2' into eclair-mr2-plus-aosp
* commit '14467eb2eea119b4d71dd7dd149479aa092e6de2':
Add "res" support for WebView.
Merge commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f' into eclair-mr2-plus-aosp
* commit 'ffacbc3419825ec1c786dd3c27f3e2a8cd071d8f':
Add Java exceptions to catch RS calls with no context or no surface.
Merge commit 'fd2f6358321e95d661f24ba4e08327268035aa59' into eclair-mr2
* commit 'fd2f6358321e95d661f24ba4e08327268035aa59':
Add Java exceptions to catch RS calls with no context or no surface.
Merge commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57' into eclair-mr2-plus-aosp
* commit '1b15acf705a6bcca333b1e8a6a48039242cc7d57':
Allow room for descenders in am/pm text.
