Merge commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658' into eclair-plus-aosp
* commit '7fdab7f9674aadf90c3be1f06d7d34b60151c658':
The new webkit won't keep RAM cache if http header has "no-store". So remove
* changes:
The new webkit won't keep RAM cache if http header has "no-store". So remove it from StreamLoader. And fix the code where we only want to cache network result.
Merge commit '8a2000df6d32f4e5df3073753055800a9363a3a5' into eclair-plus-aosp
* commit '8a2000df6d32f4e5df3073753055800a9363a3a5':
Adds Java-side of logic to make Geolocation obey Browser 'Enable Location' setting.
Merge commit '25131299aaa1b8c4f44edb33f71f0241a61939e4' into eclair-plus-aosp
* commit '25131299aaa1b8c4f44edb33f71f0241a61939e4':
Adds the ability to set Geolocation permissions from DumpRenderTree on Android.
Merge commit '84235ee923c13e58ce339c25c86f734b338a81e0' into eclair-plus-aosp
* commit '84235ee923c13e58ce339c25c86f734b338a81e0':
Add extra to exclude specific MIME-types from Fast-Track.
Also added ContactHeaderWidget accessor for passing along
this list when triggering Fast-Track. This is used so that
the header widget can hide the profile icon when launched
while already looking at the profile.
Merge commit 'f03733e7a1465b186acc1da11dca18f054c12734' into eclair-plus-aosp
* commit 'f03733e7a1465b186acc1da11dca18f054c12734':
Add dither XML flag to StateListDrawable.
Merge commit '55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d' into eclair-plus-aosp
* commit '55c6f8881fdd2c5894e6297f49a9c4e0dc81ff8d':
Fix missing break statement found by Motorola.
We currently allow the dither="true" flag to be set on
individual <bitmap> and <nine-patch> objects, but that flag
is overridden when they are included in a <selector>. This
change adds the dither="true" flag to StateListDrawable so
they can be dithered when desired.
Fixes http://b/issue?id=2068024
Merge commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc' into eclair-plus-aosp
* commit 'a5fa36481cdbe2cd324055d9f508e492482cb7dc':
Remove the decleration of com.android.im.plugin.jar in platform.xml
* changes:
Remove the decleration of com.android.im.plugin.jar in platform.xml Add a column definition for keep_signed_in when query the active account with a given provider
Merge commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d' into eclair-plus-aosp
* commit '688b0f1235aba0e82ff4eec4d935b494d9c4754d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Merge commit '1cef22890d10417977397a5dccf34956858d0803' into eclair-plus-aosp
* commit '1cef22890d10417977397a5dccf34956858d0803':
Disable data call in emergency call
Merge commit '6f89172b6e149c623fe582e4baa658299a3fc72c' into eclair-plus-aosp
* commit '6f89172b6e149c623fe582e4baa658299a3fc72c':
Fix FallRS by keeping a reference to the mesh.
Merge commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d' into eclair
* commit '36d5aaec2ee1f11ea80639c8194e4aac2be3892d':
Add FLAG_ACTIVITY_NEW_TASK flag when adding a word to the dictionary.
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Merge commit 'd3d794530962e69df54b6421ed5e0d03d76165ab' into eclair-plus-aosp
* commit 'd3d794530962e69df54b6421ed5e0d03d76165ab':
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
* changes:
add a "display_sent_time" column to the message table, to provide a hint that the UI should display time stamp for this message always. Add Gservices settings for gtalk stuff.
Merge commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5' into eclair-plus-aosp
* commit 'f1b64f64ab088a3e8cd32ec31f61c958c61d19e5':
do not merge. Remove voicesearch-specific functionality from framework.
Merge commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6' into eclair-plus-aosp
* commit '4178b9bd8e8a9d62e8e4e759c419e0d2a4ab0df6':
Cleaning up Presence API
Merge commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6' into eclair-plus-aosp
* commit '6c6d822f7b7ec967aeff3e4d2afde0ff25732aa6':
Framework changes to support HSDPA/HSUPA/HSPA
