Marco Nelissen 77f8a7a37f am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2 ...

Merge commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7' into eclair-mr2-plus-aosp

* commit 'c81e43c8ee31d986e34ee892b7d7bfbf70f82da7':
  - add javadoc for the account manager

2009-10-29 18:23:11 -07:00

..

accessibilityservice

…

accounts

resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:04:17 -07:00

annotation

…

app

Instead of a raw AIDL interface, give DropBox a Java

2009-10-28 15:49:11 -07:00

appwidget

Fix possible NPE in the code that restores widgets' state.

2009-10-15 15:09:26 -07:00

backup

Turn off most of the backup-related debug logging

2009-09-30 17:07:37 -07:00

bluetooth

Remove STOPSHIP BT logging.

2009-10-09 01:35:11 +02:00

content

am 5e5eb393: Merge change Id572ffc7 into eclair

2009-10-29 13:44:08 -07:00

database

EventLog when a database file is deleted due to corruption.

2009-09-29 11:50:32 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Patching in hidden API to allow app managed preview frame buffers.

2009-10-23 01:44:47 -04:00

inputmethodservice

Fix build.

2009-10-27 11:45:08 -07:00

net

Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp

2009-10-08 17:52:53 -07:00

os

am 1f668fff: Merge change Idb13ed9a into eclair

2009-10-29 01:20:01 -07:00

pim

Fix test breakage in testNickNameV21().

2009-10-29 12:24:26 +09:00

preference

Fix preference caching to increase recycling of preference views.

2009-10-05 15:31:47 -07:00

provider

Add error code column to SMS

2009-10-28 14:38:44 -07:00

security

…

server

do not merge - Fix for issue 2184627 cherry picked from eclair-mr2

2009-10-26 09:17:10 -07:00

service/wallpaper

Implement feature #2117336: Create event communication APIs for live wallpaper

2009-10-22 20:10:53 -07:00

speech

Merge change 25366 into eclair

2009-09-17 11:21:47 -04:00

test

…

text

am dad4780b: Merge change I3834b1cb into eclair-mr2

2009-10-19 14:04:00 -07:00

util

…

view

am 7580493b: Implement feature #2117336: Create event communication APIs for live wallpaper

2009-10-22 20:21:07 -07:00

webkit

divide mRestoredScale before use

2009-10-29 15:34:00 -04:00

widget

Do not show radio/checkboxes for <optgroup> labels.

2009-10-21 10:01:49 -04:00

package.html

…