Paul Westbrook e143bc92b2 resolved conflicts for merge of 15d3bb2c to master

2009-12-14 10:56:45 -08:00

..

accessibilityservice

…

accounts

am 74f7b139: am f307ec5d: Merge change Iafa92b8f into eclair-mr2

2009-12-02 20:33:59 -08:00

annotation

…

app

resolved conflicts for merge of 15d3bb2c to master

2009-12-14 10:56:45 -08:00

appwidget

…

backup

…

bluetooth

am ed2a70d6: docs: add the Bluetooth developer guide, and make some revisions to the BT javadocs

2009-12-10 17:42:55 -08:00

content

am c7afd922: am 97ef7637: - move the EventLog stuff out of ATSA - move the google calendar sync adapter settings out of Settings.java

2009-12-10 14:42:07 -08:00

database

am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c

2009-12-10 10:37:52 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Document that some parameters will not be null and fix getSupportedPictureFormats.

2009-12-08 09:41:08 +08:00

inputmethodservice

Close popup when Keyboard gets a CANCEL motion event.

2009-12-08 14:18:19 -08:00

net

resolved conflicts for merge of 15d3bb2c to master

2009-12-14 10:56:45 -08:00

os

resolved conflicts for merge of f6bb01b0 to master

2009-12-11 14:55:24 -08:00

pim

am 328c0e79: - removed the concept of Entity from the ContentProvider APIs - removed the parcelling ability from Entity and EntityIterator and made them public - added an EntityIterator abstract implementation that allow easy wrapping of a Cursor - changed the VCard c

2009-12-10 10:37:52 -08:00

preference

…

provider

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

security

…

server

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

service/wallpaper

Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

2009-11-20 16:27:27 -08:00

speech

…

test

Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests

2009-12-10 14:49:14 -08:00

text

am 7762d936: Unbundling work

2009-12-14 10:10:20 -08:00

util

Eliminate CrashData and friends.

2009-12-11 13:27:04 -08:00

view

Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests

2009-12-10 14:49:14 -08:00

webkit

Notify native plugin code when the browser discards the customView.

2009-12-14 08:48:42 -05:00

widget

Unbundling work

2009-12-14 09:24:09 -08:00

package.html

…