Brad Fitzpatrick e407a608b0 resolved conflicts for merge of 7d6362de to master ...

Change-Id: Ic26dd6d617f0edba549c992256511613df00caa6

2010-06-03 17:15:48 -07:00

..

accessibilityservice

…

accounts

Add needsOtaServiceProvisioning to Phone.

2010-05-24 17:50:32 -07:00

annotation

…

app

Merge "new API in Context. on openDatabase, new param DatabaseErrorHandler"

2010-06-03 12:42:32 -07:00

appwidget

Call into app widget hosts when the provider is updated.

2010-05-04 11:49:12 -07:00

bluetooth

Removing STOPSHIP logs.

2010-05-18 14:36:48 -07:00

content

fix docs errors

2010-06-03 14:44:39 -07:00

database

resolved conflicts for merge of 7d6362de to master

2010-06-03 17:15:48 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add javadoc for camera scene modes.

2010-05-31 16:41:14 +08:00

inputmethodservice

merge from open-source master

2010-05-03 16:19:31 -07:00

net

am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master

2010-05-12 15:25:07 -07:00

os

Do not invoke onProgressUpdate if the task is canceled.

2010-06-03 10:56:41 -07:00

pim

Make vCard code a separated static library.

2010-05-20 11:25:37 -07:00

preference

am 56d4bcd8: am 627356ce: am d6c0bb0f: merge from open-source master

2010-05-19 08:36:58 -07:00

provider

Prototype Content Provider support for MTP/PTP devices.

2010-06-01 22:12:44 -04:00

security

…

server

am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo

2010-05-04 18:30:47 -07:00

service

Add new API to take over a window's Surface.

2010-05-18 10:46:33 -07:00

speech

Fixing: RecognitionService logcat spam "cancel called..."

2010-05-04 20:53:52 +01:00

test

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

am 913dbc50: am a9f06fef: am ee7e6a78: merge from open-source master

2010-06-03 09:12:40 -07:00

util

Add KDDI/Softbank to available Shift_Jis mapping.

2010-05-25 14:10:09 -07:00

view

am 1bcc845f: am ca583f09: Merge "Fixed some minor bugs in MotionEvent recycling." into kraken

2010-06-02 22:41:30 -07:00

webkit

Merge "Update EmbeddedZoomControl to use new ZoomManager methods."

2010-06-03 10:35:04 -07:00

widget

am ef5ce59a: am 18e69dfc: Checkpoint. Data structures for Notifications in place.

2010-06-02 22:38:43 -07:00

package.html

…