OSDN Git Service
Cary Clark [Wed, 3 Mar 2010 15:05:16 +0000 (10:05 -0500)]
refactor find state and scrolling
Separate out state when find is up and is empty.
Request a scroll when setting a match, rather than when drawing.
Don't draw if there's no match.
Companion fix in external/webkit and packages/apps/Browser
http://b/
2370069
Cary Clark [Wed, 3 Mar 2010 15:05:16 +0000 (10:05 -0500)]
refactor find state and scrolling
Separate out state when find is up and is empty.
Request a scroll when setting a match, rather than when drawing.
Don't draw if there's no match.
Companion fix in external/webkit and packages/apps/Browser
http://b/
2370069
Bjorn Bringert [Wed, 3 Mar 2010 13:39:31 +0000 (05:39 -0800)]
Merge "Call close() instead of deactivate() in CursorToBulkCursorAdaptor.close()"
Bjorn Bringert [Mon, 8 Feb 2010 18:59:34 +0000 (18:59 +0000)]
Call close() instead of deactivate() in CursorToBulkCursorAdaptor.close()
This seems like a long-lived copy-and-paste bug.
Fixes http://b/issue?id=
2015069
This is the master version of change
https://android-git.corp.google.com/g/8636 which never
made it into Eclair.
Change-Id: I75f3a1942994982d5e5f779ab43a573cb953490b
Tadashi G. Takaoka [Wed, 3 Mar 2010 07:15:13 +0000 (16:15 +0900)]
Fixed NPE by guarding the reference of variable
Bug:
2395174
Bjorn Bringert [Tue, 2 Mar 2010 11:16:17 +0000 (11:16 +0000)]
Add SearchManager.SUGGEST_COLUMN_TEXT_2_URL
This column overrides SUGGEST_COLUMN_TEXT_2. SearchDialog
and QuickSearchBox render the value of this column as a URL in
green.
Part of the fix for http://b/issue?id=
2380681
Change-Id: I6735e0eba90e24c81f9e72520f257e5e61796d7a
Dianne Hackborn [Wed, 3 Mar 2010 08:08:31 +0000 (00:08 -0800)]
Fix issue #
2325621 Runtime restart after launching Android keyboard setting .
Brian Carlstrom [Wed, 3 Mar 2010 03:05:12 +0000 (19:05 -0800)]
Merge "Fixing spelling of intiialization to initialization in comment"
Adam Powell [Wed, 3 Mar 2010 02:20:13 +0000 (18:20 -0800)]
Merge "Fix a bug in OverScroller.setFinalX/Y"
Yu Shan Emily Lau [Wed, 3 Mar 2010 02:12:12 +0000 (18:12 -0800)]
Merge "Added the Camera Preveiw memory test which can help to isolate the memory leak issue."
Mike Lockwood [Wed, 3 Mar 2010 02:06:30 +0000 (18:06 -0800)]
Merge "DockObserver: Watch for exceptions in LocationManger.isProviderEnabled()."
Adam Powell [Wed, 3 Mar 2010 02:04:43 +0000 (18:04 -0800)]
Fix a bug in OverScroller.setFinalX/Y
Wink Saville [Wed, 3 Mar 2010 02:00:01 +0000 (18:00 -0800)]
Merge "Fix documentation."
Mike Lockwood [Wed, 3 Mar 2010 01:49:47 +0000 (20:49 -0500)]
DockObserver: Watch for exceptions in LocationManger.isProviderEnabled().
Change-Id: Ieb9f6b0c20a6ce2223cb4b4956580b8543094c2f
Signed-off-by: Mike Lockwood <lockwood@android.com>
Doug Felt [Tue, 2 Mar 2010 22:05:03 +0000 (14:05 -0800)]
Disable tests that require package-private access to code under test.
Dianne Hackborn [Wed, 3 Mar 2010 01:19:29 +0000 (17:19 -0800)]
Maybe fix issue #
2482201: Paired bluetooth device looks like a qwerty keyboard
We now only consider a device to be a default keyboard if its name
has "-keypad". A hack, but whatever.
Also add some debug logging for the input state to help identify such
issues in the future.
Mike Lockwood [Wed, 3 Mar 2010 01:13:28 +0000 (17:13 -0800)]
Merge "Hide GeocoderParams class from public API."
Adam Powell [Wed, 3 Mar 2010 01:13:02 +0000 (17:13 -0800)]
Merge "Added Scroller compatibility methods to OverScroller"
Adam Powell [Wed, 3 Mar 2010 01:09:38 +0000 (17:09 -0800)]
Added Scroller compatibility methods to OverScroller
Romain Guy [Wed, 3 Mar 2010 01:09:27 +0000 (17:09 -0800)]
Merge "Add new CAPTURE_LAYERS command to HiearchyViewer protocol."
Romain Guy [Wed, 3 Mar 2010 01:07:47 +0000 (17:07 -0800)]
Add new CAPTURE_LAYERS command to HiearchyViewer protocol.
This command is used by the desktop tool to export a given view hierarchy into
a layered file format.
Brian Carlstrom [Wed, 3 Mar 2010 00:56:59 +0000 (16:56 -0800)]
Merge "SslCertificate should clone Dates"
Dima Zavin [Tue, 2 Mar 2010 23:39:44 +0000 (15:39 -0800)]
surfaceflinger: remove un-cached buffers hack for Adreno
Change-Id: I5ae4e74bfa3e25b55be2cddf7b3c51368a140ab9
Signed-off-by: Dima Zavin <dima@android.com>
Mike Lockwood [Wed, 3 Mar 2010 00:39:50 +0000 (19:39 -0500)]
Hide GeocoderParams class from public API.
This does not need to be publc until we unbundle the network location provider.
Change-Id: Ib4109d2392624242eee33f271a8151588e3f0c56
Signed-off-by: Mike Lockwood <lockwood@android.com>
Brian Carlstrom [Tue, 2 Mar 2010 22:51:22 +0000 (14:51 -0800)]
SslCertificate should clone Dates
To avoid external tampering with Dates withing SslCertificate by code
holding on to pointers to Dates used in the constructor or code
mutating values returned by the accessors, we now clone Dates taking
in as arguments and returned to callers.
Vasu Nori [Wed, 3 Mar 2010 00:08:38 +0000 (16:08 -0800)]
Merge "resubmit reverted CL https://android-git.corp.google.com/g/#change,42682"
Yu Shan Emily Lau [Tue, 2 Mar 2010 03:24:05 +0000 (19:24 -0800)]
Added the Camera Preveiw memory test which can help to isolate the memory leak issue.
Dianne Hackborn [Tue, 2 Mar 2010 23:07:33 +0000 (15:07 -0800)]
Merge "Fix issue #
2482423: Settings is broken due to dead-code stripping"
Ken Shirriff [Tue, 2 Mar 2010 22:57:47 +0000 (14:57 -0800)]
Merge "Remove calendar.jar."
Dianne Hackborn [Tue, 2 Mar 2010 22:56:51 +0000 (14:56 -0800)]
Fix issue #
2482423: Settings is broken due to dead-code stripping
Take care of more custom classes in layouts, and also scan through
preference XMLs.
Leon Scroggins [Tue, 2 Mar 2010 20:58:40 +0000 (15:58 -0500)]
Create a method to find matching URLs and use it in updateVisitedHistory.
The method for finding matching URLs is taken from Bookmarks.java in
the Browser package. When looking to see if the URL is already in
the database, include versions which have/don't have "http" as well
as "www."
Part of fix for http://b/issue?id=
2442391
Vasu Nori [Tue, 2 Mar 2010 22:12:19 +0000 (14:12 -0800)]
resubmit reverted CL https://android-git.corp.google.com/g/#change,42682
register a logging func with sqlite, to get extra info on errors
sqlite3 (latest patch) from DRH included this functionality.
use it to get more useful debugging info from sqlite
Romain Guy [Tue, 2 Mar 2010 21:38:44 +0000 (13:38 -0800)]
Make sure all list items know they are in a window.
Bug #
2476671
If you had a ListView with a layout_height equals to WRAP_CONTENT, you would
get list children with a parent but not attached to the window. This was caused
by the onMeasure() code: that code was obtaining views from the adapter to
measure them and putting them in the recyler for later reuse. Unfortunately
the recycler assumes that views have been attached to the window but detached
from the parent, thus causing much grief. The fix simply forces measured views
to be added to the window the first time they come out of the recycler.
ListView, bow before me for I am your master!
Brian Carlstrom [Tue, 2 Mar 2010 21:30:04 +0000 (13:30 -0800)]
Fixing spelling of intiialization to initialization in comment
Fred Quintana [Tue, 2 Mar 2010 21:23:17 +0000 (13:23 -0800)]
Merge "change ObserverNode.binderDied() to lock the root node before manipulating the observers tree by calling removeObserverLocked()"
Ken Shirriff [Tue, 2 Mar 2010 20:50:03 +0000 (12:50 -0800)]
Remove calendar.jar.
This jar file failed to meet its goal of unbundling calendar.
bug
2468654
Dave Sparks [Tue, 2 Mar 2010 20:56:37 +0000 (12:56 -0800)]
Fix build. I screwed up a merge.
Dave Sparks [Tue, 2 Mar 2010 03:29:58 +0000 (19:29 -0800)]
Add locking to signal in AudioCache::notify(). Bug
2317844.
Vasu Nori [Mon, 1 Mar 2010 22:47:47 +0000 (14:47 -0800)]
add warning in finalizer. deprecate protected members.
finalizer shoudl not be called ever. add a warning to say that.
adeprecate a few members in SQLiteProgram.java. they should not
have had protected access level. shoudl be package.
Dianne Hackborn [Tue, 2 Mar 2010 19:43:47 +0000 (11:43 -0800)]
Merge "Fix issue #
2468687: back and home keys don't work on InCallScreen"
Dianne Hackborn [Tue, 2 Mar 2010 07:36:02 +0000 (23:36 -0800)]
Fix issue #
2468687: back and home keys don't work on InCallScreen
Make sure we update the focus after hiding a window via the
policy visibility.
Romain Guy [Tue, 2 Mar 2010 19:43:14 +0000 (11:43 -0800)]
Merge "Turn on fading scrollbars by default. Bug #
2142162"
Romain Guy [Tue, 2 Mar 2010 19:42:11 +0000 (11:42 -0800)]
Turn on fading scrollbars by default.
Bug #
2142162
Gilles Debunne [Tue, 2 Mar 2010 19:41:49 +0000 (11:41 -0800)]
Merge "Null pointer tests removed from HeaderViewListAdapter."
Brian Carlstrom [Tue, 2 Mar 2010 19:31:20 +0000 (11:31 -0800)]
Merge "SslCertificate should use Dates - fixing api for build"
Patrick Scott [Tue, 2 Mar 2010 13:58:44 +0000 (08:58 -0500)]
Add a client for WebBackForwardList operations.
Provide a custom data slot in WebHistoryItem to store application data in the
history item. A client of WebBackForwardList can insert their custom data into
the item when created. In onIndexChanged, the custom data can be read by the
client.
Brian Carlstrom [Tue, 2 Mar 2010 19:24:39 +0000 (11:24 -0800)]
SslCertificate should use Dates - fixing api for build
Also fixing missing @deprecated noticed when updating API
Fred Quintana [Tue, 2 Mar 2010 19:18:16 +0000 (11:18 -0800)]
change ObserverNode.binderDied() to lock the root node before manipulating
the observers tree by calling removeObserverLocked()
http://b/issue?id=
2457485
Brian Carlstrom [Tue, 2 Mar 2010 19:08:32 +0000 (11:08 -0800)]
Merge "SslCertificate should provide Date interface"
Brian Carlstrom [Tue, 2 Mar 2010 18:02:19 +0000 (10:02 -0800)]
SslCertificate should provide Date interface
While working on out openssl code, I found a Y2k bug that the dates
from invalidate certificates could be shown as 1909 instead of 2009.
The reason was because SslCertificate/BrowserActivity passed the
values around as Strings even though the started as Dates (from
X509Certificate) and were converted backed to Dates before
presentation by BrowserActivity's reformatCertificateDate.
SslCertificate now maintains date fields internally as Date objects
without converting them to Strings. The constructor and String
accessors, which are now @deprecated, now specify the format as an ISO
8601 date string which uses 4 digit years.
BrowserActivity now reformatCertificateDate is now simply
formatCertificateDate and no longer has to convert from String to Date
and back to String to get proper Locale formatting.
CTS SslCertificateTest also updated.
Grace Kloba [Tue, 2 Mar 2010 19:01:41 +0000 (11:01 -0800)]
Merge "When titlebar's visible height changed, it means the WebKit viewsize need to be updated."
Gilles Debunne [Tue, 2 Mar 2010 19:00:50 +0000 (11:00 -0800)]
Null pointer tests removed from HeaderViewListAdapter.
The mHeaderViewInfos and mFooterViewInfos lists were sometimes tested for nullity
and sometimes not. Should these values be null, some conditionnal code was actually
flawed in getView() and getItem() because of too strong 'and' conditionnals.
These lists are created upon declaration in ListView and are then shared and hence
cannot be null. Null tests were hence removed. getView() and getItem() get simpler
and work as before.
Change-Id: I279e482730ce6148a559d15a9863afc8f6b67780
Bjorn Bringert [Tue, 2 Mar 2010 18:57:35 +0000 (10:57 -0800)]
Merge "Fixing: search button and mic button are not right-aligned"
Valentin Kravtsov [Tue, 2 Mar 2010 18:44:51 +0000 (18:44 +0000)]
Fixing: search button and mic button are not right-aligned
Second part of bug fix for: http://b/issue?id=
2478280
On sapphire only, the right edge of the mic and search buttons is not aligned
Change-Id: I1919c762eafca19de026fb4f10e03574d02b423c
Eric Laurent [Tue, 2 Mar 2010 18:41:23 +0000 (10:41 -0800)]
Merge "Issue
2071329: audio track is shorter than video track for video capture on sholes"
Grace Kloba [Tue, 2 Mar 2010 18:19:53 +0000 (10:19 -0800)]
When titlebar's visible height changed, it means the
WebKit viewsize need to be updated.
Fix http://b/issue?id=
2470621
Ying Wang [Sat, 20 Feb 2010 02:47:49 +0000 (18:47 -0800)]
Fix Proguard flags.
Leon Clarke [Tue, 2 Mar 2010 16:44:48 +0000 (08:44 -0800)]
am
ba74d7cc: am
e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2
Merge commit '
ba74d7ccadc34d09d57886120e9d412d9edbc4d7'
* commit '
ba74d7ccadc34d09d57886120e9d412d9edbc4d7':
Fix issue with authentication with flash
Jean-Michel Trivi [Tue, 2 Mar 2010 16:41:33 +0000 (08:41 -0800)]
Merge "First implementation of the audio focus management as an extension of AudioManager and AudioService."
Jean-Michel Trivi [Thu, 28 Jan 2010 19:56:42 +0000 (11:56 -0800)]
First implementation of the audio focus management as an extension
of AudioManager and AudioService.
Leon Clarke [Tue, 2 Mar 2010 16:38:54 +0000 (08:38 -0800)]
am
e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2
Merge commit '
e861b8f95dd52f89b7e7e34ba1bfc5b85c290292' into eclair-mr2-plus-aosp
* commit '
e861b8f95dd52f89b7e7e34ba1bfc5b85c290292':
Fix issue with authentication with flash
Cary Clark [Tue, 2 Mar 2010 16:37:18 +0000 (08:37 -0800)]
Merge "account for find dialog height when positioning layers"
Leon Clarke [Tue, 2 Mar 2010 16:33:10 +0000 (08:33 -0800)]
Merge " Fix issue with authentication with flash" into eclair-mr2
Mike Reed [Tue, 2 Mar 2010 16:27:28 +0000 (08:27 -0800)]
Merge "initial add of Arabic, Hebrew and Thai fonts."
Mike Reed [Tue, 2 Mar 2010 16:25:44 +0000 (11:25 -0500)]
initial add of Arabic, Hebrew and Thai fonts.
Grace Kloba [Tue, 2 Mar 2010 16:21:22 +0000 (08:21 -0800)]
Merge "Start the synchronous load in the WebCore thread."
Eric Laurent [Fri, 26 Feb 2010 10:47:27 +0000 (02:47 -0800)]
Issue
2071329: audio track is shorter than video track for video capture on sholes
Add API to retrieve number of frames dropped by audio input kernel driver.
Submitted on behalf of Masaki Sato <masaki.sato@motorola.com>
Cary Clark [Tue, 2 Mar 2010 15:59:44 +0000 (10:59 -0500)]
account for find dialog height when positioning layers
The Find dialog draws on top of the WebView, including any
layers attached to the bottom of the screen. Adjust the view
dimenions returned to the layer code by the height of the Find
dialog if visible.
http://b/
2453769
Mike Lockwood [Tue, 2 Mar 2010 15:38:40 +0000 (07:38 -0800)]
Merge "Don't eat IllegalArgumentExceptions in LocationManagerService."
Andy McFadden [Tue, 2 Mar 2010 15:36:23 +0000 (07:36 -0800)]
Merge "Tone down a log message."
Mike Lockwood [Tue, 2 Mar 2010 15:33:55 +0000 (10:33 -0500)]
Don't eat IllegalArgumentExceptions in LocationManagerService.
The exeptions should be returned to the Binder client instead.
Change-Id: I8ab36880622bf8b4fdf28407dec50652c48b6712
Signed-off-by: Mike Lockwood <lockwood@android.com>
Derek Sollenberger [Tue, 2 Mar 2010 15:00:21 +0000 (07:00 -0800)]
am
717c6ae0: (-s ours) am
2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Merge commit '
717c6ae0cf1f82168b18ba2ba248313bcad7ae3e'
* commit '
717c6ae0cf1f82168b18ba2ba248313bcad7ae3e':
DO NOT MERGE. force plugins to render on top of browser content.
Derek Sollenberger [Tue, 2 Mar 2010 14:44:47 +0000 (06:44 -0800)]
am
2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Merge commit '
2705c8f09975f1bf10c84af323a67c104a177129' into eclair-mr2-plus-aosp
* commit '
2705c8f09975f1bf10c84af323a67c104a177129':
DO NOT MERGE. force plugins to render on top of browser content.
Leon Clarke [Tue, 23 Feb 2010 14:46:39 +0000 (14:46 +0000)]
Fix issue with authentication with flash
Derek Sollenberger [Tue, 2 Mar 2010 14:33:32 +0000 (06:33 -0800)]
Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Patrick Scott [Tue, 2 Mar 2010 13:40:09 +0000 (05:40 -0800)]
Merge "Store the LoadListener in the SslErrorHandler passed to the client."
Mike Lockwood [Tue, 2 Mar 2010 12:29:04 +0000 (04:29 -0800)]
Merge "Don't poke user activity when unplugging unless screen is already on."
Grace Kloba [Tue, 2 Mar 2010 07:10:10 +0000 (23:10 -0800)]
Start the synchronous load in the WebCore thread.
Fix http://b/issue?id=
2480606
Ken Shirriff [Tue, 2 Mar 2010 06:46:07 +0000 (22:46 -0800)]
Merge "Remove DateException and obsolete DateUtils functions."
Romain Guy [Tue, 2 Mar 2010 05:56:22 +0000 (21:56 -0800)]
Merge "Cleaning in ListWithEditTextHeaderTest."
Dianne Hackborn [Tue, 2 Mar 2010 05:42:15 +0000 (21:42 -0800)]
Move the pointer location thing out of common.
Dianne Hackborn [Tue, 2 Mar 2010 01:43:39 +0000 (17:43 -0800)]
Fix issue #
2448075: aapt doesn't fix up activity-alias android:targetActivity links
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
Charles Chen [Tue, 2 Mar 2010 03:05:20 +0000 (19:05 -0800)]
Merge "Fixing a bug with TTS that caused TTS to ignore the default settings unless the user had set the defaults to always override app settings."
Charles Chen [Tue, 2 Mar 2010 02:52:41 +0000 (18:52 -0800)]
Fixing a bug with TTS that caused TTS to ignore the default settings
unless the user had set the defaults to always override app settings.
Mathias Agopian [Tue, 2 Mar 2010 01:51:17 +0000 (17:51 -0800)]
fix [
2425395] portrait UI briefly shows in landscape
the "freeze" timeout was not initialized properly which caused it
to kick-in immediately instead of after 5s
Mathias Agopian [Tue, 2 Mar 2010 00:09:43 +0000 (16:09 -0800)]
Added a name to Surface created by SurfaceFlinger
Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
Mathias Agopian [Mon, 1 Mar 2010 22:37:50 +0000 (14:37 -0800)]
fix [
2476230] sensor battery stats could get out of sync if an error occurs
Fixed a few problems with the SensorService:
- a race condition when talking to the BatteryStatService
- only report changes to BatteryStatService when there are no errors
(ie: when a change actually happens)
- tell the BatteryStatService when a sensor is deactivated because its
client died
- rewrite enableSensor() so it's readable
- implement dump() so dumpsys will display some infos about active sensors
- recompute the delay properly when sensors are added/removed
Mike Lockwood [Tue, 2 Mar 2010 02:28:58 +0000 (21:28 -0500)]
Don't poke user activity when unplugging unless screen is already on.
Change-Id: I5a5f233541e13b3a916ad0d8b3bf8d6fb49ab7fd
BUG:
1317687
Signed-off-by: Mike Lockwood <lockwood@android.com>
Romain Guy [Tue, 2 Mar 2010 01:20:57 +0000 (17:20 -0800)]
Apply alpha animations on ImageView instances.
Bug #
2479570
Daniel Sandler [Tue, 2 Mar 2010 01:16:55 +0000 (17:16 -0800)]
Merge "New vibrate/silent mode behavior."
Ken Shirriff [Mon, 1 Mar 2010 23:26:46 +0000 (15:26 -0800)]
Remove unused Calendar.insertVEvent method
Romain Guy [Tue, 2 Mar 2010 00:41:27 +0000 (16:41 -0800)]
Merge "Prevent crash in Dialog. Bug #
2249637"
Romain Guy [Tue, 2 Mar 2010 00:39:17 +0000 (16:39 -0800)]
Prevent crash in Dialog.
Bug #
2249637
Ficus Kirkpatrick [Tue, 2 Mar 2010 00:36:26 +0000 (16:36 -0800)]
Merge "Demote the famous ResourceTypes warning to LOGV."
Ficus Kirkpatrick [Tue, 2 Mar 2010 00:33:53 +0000 (16:33 -0800)]
Demote the famous ResourceTypes warning to LOGV.
It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.
Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
Grace Kloba [Tue, 2 Mar 2010 00:27:44 +0000 (16:27 -0800)]
am
c0524d26: (-s ours) am
3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '
c0524d26a6bcfa28a930f446717dffcd9ce3c3f5'
* commit '
c0524d26a6bcfa28a930f446717dffcd9ce3c3f5':
DO NOT MERGE
Marc Blank [Tue, 2 Mar 2010 00:18:27 +0000 (16:18 -0800)]
Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA"
Marc Blank [Mon, 1 Mar 2010 22:57:42 +0000 (14:57 -0800)]
Rename _SYNC_LOCAL_ID to _SYNC_DATA
* This is being used as a discretionary column by Exchange calendar
sync, so rename to avoid association with old usage
Change-Id: I544e285fa04d252c945c1953b57ef67da0e588ae
Grace Kloba [Tue, 2 Mar 2010 00:13:21 +0000 (16:13 -0800)]
am
3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '
3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp
* commit '
3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
DO NOT MERGE
Grace Kloba [Tue, 2 Mar 2010 00:02:12 +0000 (16:02 -0800)]
Merge "DO NOT MERGE" into eclair-mr2