Merge commit '65fac51faf8ffe759a634497b1654a3b47406107'
* commit '65fac51faf8ffe759a634497b1654a3b47406107':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit '9882f38584882461dbfef229e4fe316dacebd9c5' into eclair-mr2-plus-aosp
* commit '9882f38584882461dbfef229e4fe316dacebd9c5':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb'
* commit '977e8d28e5e4f8dbb8997b2206a943e17f8be5bb':
Add postdata identifier so that if we cache the post
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 '96fce6e112aec1e09c82cfd7657381ce112dc555' into eclair-mr2
* commit '96fce6e112aec1e09c82cfd7657381ce112dc555':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2' into eclair-mr2-plus-aosp
* commit 'e81c9609cc99d10045b70f79729b4b0edbf793c2':
Add postdata identifier so that if we cache the post
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
This allows us to adjust immediately when we receive a correct light sensor reading
after the screen turns on.
Change-Id: I627047365640761727348e577c9164a6d6be2772
Signed-off-by: Mike Lockwood <lockwood@android.com>
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 'c481990b630c7ff5bca155f4b1385f71097500d3'
* commit 'c481990b630c7ff5bca155f4b1385f71097500d3':
fix [2243164] live wallpaper screen artifacts at end of boot
Merge commit 'b448893039dc7f06ff5a76e8be6444808b4cf2ea' into eclair-mr2-plus-aosp
* commit 'b448893039dc7f06ff5a76e8be6444808b4cf2ea':
fix [2243164] live wallpaper screen artifacts at end of boot
Merge commit '45dd12cb0834ea5d72872a6d5b3095f3af152434' into eclair-mr2
* commit '45dd12cb0834ea5d72872a6d5b3095f3af152434':
fix [2243164] live wallpaper screen artifacts at end of boot
Merge commit '022a38a00a460dae1f45bb532780b519048e2dd8'
* commit '022a38a00a460dae1f45bb532780b519048e2dd8':
docs: add new document for the win usb driver;
Merge commit 'f6ff2be323812b5525a0755d194b2fc751ba5968' into eclair-mr2-plus-aosp
* commit 'f6ff2be323812b5525a0755d194b2fc751ba5968':
Import revised translations. DO NOT MERGE
