Merge commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4'
* commit 'eac4222f7f30bf1df14b223cf62e594914dd32d4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '949ffa3da5231772425c3bde50caeab6c4d08ec5' into eclair-mr2-plus-aosp
* commit '949ffa3da5231772425c3bde50caeab6c4d08ec5':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '11cff8cd30f03b5adb137e985532543da5e960c4' into eclair-mr2
* commit '11cff8cd30f03b5adb137e985532543da5e960c4':
Add a way for wallpapers to know the delta between virtual screens.
Merge commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990'
* commit '9e0da5bd2d40b33d7de8897aa5e95a06d42fd990':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit '452a52968f43c21e9a040009e209df023a34876c' into eclair-mr2-plus-aosp
* commit '452a52968f43c21e9a040009e209df023a34876c':
Make vCard exporter check invalid phone numbers and re-format them if needed.
Merge commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525' into eclair-mr2-plus-aosp
* commit 'e8341ebbc672fb196e31cadbf5cf43770cec0525':
Fix code example in Parcelable javadoc
Merge commit '2bb53754337225508f2b4d12f1575df7c226100c' into eclair-mr2
* commit '2bb53754337225508f2b4d12f1575df7c226100c':
Fix code example in Parcelable javadoc
Merge commit '6720bb8314600a2b55a18159b4a22dc4b18aec88'
* commit '6720bb8314600a2b55a18159b4a22dc4b18aec88':
new gservices flag for delaying bad gmail operations
Merge commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf'
* commit '29c00b0f09777c0ef94b53a0a7333d8416fb7abf':
Allow plugins to load java classes from their apk.
Merge commit '65fac51faf8ffe759a634497b1654a3b47406107'
* commit '65fac51faf8ffe759a634497b1654a3b47406107':
Do not apply light sensor debounce logic while the light sensor is still warming up.
Merge commit '26c91fa694464c79de39988f9f42cee375ff0a14' into eclair-mr2-plus-aosp
* commit '26c91fa694464c79de39988f9f42cee375ff0a14':
new gservices flag for delaying bad gmail operations
Merge commit '521123e0ed91348be81d3d754d3ee13ecf454ced' into eclair-mr2-plus-aosp
* commit '521123e0ed91348be81d3d754d3ee13ecf454ced':
Allow plugins to load java classes from their apk.
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.
Provide the functions to be called from native code that take
the plugin's location and desired class name and then load that
class from the plugin's apk if it is available.
see http://b/2215696
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
