Merge commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e'
* commit 'c53cc103908fbd73bebf45f1dab36dc808439c2e':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35'
* commit '75face7d2dad974781a5aaf48e0d20ebe6e0ca35':
Make vCard parser invalid lines in vCard file which look like some comment.
Merge commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0'
* commit 'ac94fbd081450ae7f208e4525b23b36d90d382e0':
Capture failure of copybit->stretch()
Fix obvious typo bug in egl.cpp
LocationManagerService: Fix race when removing LocationListener
Don't return when blocking is true.
Fix of compatibility with multifunction extUSB adapters.
Fix documentation example, per issue 895 on android.googlecode.com
Merge commit '0e983864fca215513de9664573dcc3bbadf41e79' into eclair-mr2-plus-aosp
* commit '0e983864fca215513de9664573dcc3bbadf41e79':
Support vCard format emitted by Windows Mobile 6.5, which contains invalid "VALUE" params and
Merge commit 'df0ce74126e75963a33201b6c98ce46837a2e55e' into eclair-mr2-plus-aosp
* commit 'df0ce74126e75963a33201b6c98ce46837a2e55e':
Make vCard parser invalid lines in vCard file which look like some comment.
This change allows applications to nest children RemoteViews
inside an existing set of RemoteViews. These nested views
are inflated and treated as addView() calls.
This change also allows ViewFlipper through RemoteViews, and
adds logic surpress flipping when the parent window is
detached or behind the lockscreen.
Fixes http://b/2239905
Merge commit 'f7dec4a7986c8d4034d9b029b315bfef4f73158e'
* commit 'f7dec4a7986c8d4034d9b029b315bfef4f73158e':
Remove "@hide pending API council" in webkit to expose
Merge commit '2689808c79d16826dbd3596183fae03c788fb130'
* commit '2689808c79d16826dbd3596183fae03c788fb130':
Expose WallpaperSettingsActivity in the public API.
Merge commit 'd9e22ed8fe08c8c9fcf5c47a6b25d335a3158056' into eclair-mr2-plus-aosp
* commit 'd9e22ed8fe08c8c9fcf5c47a6b25d335a3158056':
Remove "@hide pending API council" in webkit to expose
Merge commit '704af39c283060047441771e242d89fb3296bffb' into eclair-mr2-plus-aosp
* commit '704af39c283060047441771e242d89fb3296bffb':
Expose WallpaperSettingsActivity in the public API.
Merge commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65' into eclair-mr2
* commit '0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65':
Remove "@hide pending API council" in webkit to expose
the apis to SDK.
Remove @hide in GeolocationPermissions and WebStorage
to expose them to the SDK users.
Remove @hide for freeMemory() in WebView.
Remove @hide comment in CallbackProxy and
GoogleLocationSettingManager as they are not public class.
Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-mr2
* commit '638d86535264b24b54698fca7e18e68571fe0bad':
Expose WallpaperSettingsActivity in the public API.
e.g. "# Comment?"
In both vCard 2.1 and vCard 3.0, this syntax is never allowed, but some actual exporter seems to emit this kind of comment sometimes.
Both vCard 2.1 and vCard 3.0 allows some property to use multiple lines, so this change may cause another problem.
For example, if the "NOTE" property uses Quoted-Printable type, has several lines, and one of the lines starts with '#', we cannot know whether the line is "comment" or not.
Fortunately, in this change, the line is parsed as part of "NOTE" property, so I think there's no problem "right now", which does not mean that it is completely fine with vCard files Android will encounter in the future.
Internal issue number: 2245363
Merge commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f'
* commit '62ad899fa6edb7311eb4f6e0dc2da7e354ce359f':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit '087c06039faeac54aa3063b643c5a6aafe51aa30' into eclair-mr2-plus-aosp
* commit '087c06039faeac54aa3063b643c5a6aafe51aa30':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit '2b3970a2956152a508254aa2675b68df363d46c1' into eclair-mr2
* commit '2b3970a2956152a508254aa2675b68df363d46c1':
Only use FLAG_ACTIVITY_CLEAR_TOP on the search intent when from global search.
Merge commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5'
* commit 'e4f5e840a3a32764dc49396eb1d8de898f3ed7a5':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit 'f5f452facab27a4c05361f9a61cee2098c2d5043'
* commit 'f5f452facab27a4c05361f9a61cee2098c2d5043':
Set argv[0] from the main thread of an app, not a random binder thread
Merge commit '77be730ace28b9e6543da25f53305496402af295'
* commit '77be730ace28b9e6543da25f53305496402af295':
Add UPDATE_ACTION to Gservices, used by the new checkin service.
Merge commit '811f655366461d0f21f970bcac07dd2084fd54fa' into eclair-mr2-plus-aosp
* commit '811f655366461d0f21f970bcac07dd2084fd54fa':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1' into eclair-mr2-plus-aosp
* commit '307fbbf2b6dbdbc9249c492d5569e874207de5b1':
Set argv[0] from the main thread of an app, not a random binder thread
Merge commit '883be83eab608237652e013b26fe871c18fa8901' into eclair-mr2-plus-aosp
* commit '883be83eab608237652e013b26fe871c18fa8901':
Add UPDATE_ACTION to Gservices, used by the new checkin service.
Merge commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91' into eclair-mr2
* commit '8d51f7101d2427953dbff9b4b8f8c9fdc0dc4a91':
b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '49fa9e00986993f5cf05f1092c30479cb98eb254' into eclair-mr2
* commit '49fa9e00986993f5cf05f1092c30479cb98eb254':
Set argv[0] from the main thread of an app, not a random binder thread
Merge commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7'
* commit '7e3873a0d24453057850b408f17fa0e2e37ba0c7':
Expose PowerManager.isScreenOn in the public api.
Merge commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356' into eclair-mr2-plus-aosp
* commit '6b07bf3d8f8f9b5124c19f1206e11634a774c356':
Expose PowerManager.isScreenOn in the public api.
Merge commit '3cba72880b78b81cda2868136462c9e261a3e403' into eclair-mr2
* commit '3cba72880b78b81cda2868136462c9e261a3e403':
Expose PowerManager.isScreenOn in the public api.
