Dianne Hackborn 36e5f667bc resolved conflicts for merge of 2eb12a47 to master ...

Change-Id: I79eb9d9f083e51ec1b99145d81632683669e7a99

2010-06-24 16:29:54 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

accounts

Add needsOtaServiceProvisioning to Phone.

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

annotation

Add Annotation for optional features.

2009-12-14 17:52:20 -08:00

app

resolved conflicts for merge of 2eb12a47 to master

2010-06-24 16:29:54 -07:00

appwidget

am 801b63d3: am 51e895f0: Merge "Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout changed." into gingerbread

2010-06-23 17:50:42 -07:00

bluetooth

Changes for bluetooth keyboard support.

2010-06-21 16:23:42 -07:00

content

resolved conflicts for merge of 2eb12a47 to master

2010-06-24 16:29:54 -07:00

database

resolved conflicts for merge of 2eb12a47 to master

2010-06-24 16:29:54 -07:00

ddm

Added dumpHprofDataDdms() call.

2010-01-29 13:29:51 -08:00

debug

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00

emoji

auto import from //branches/cupcake_rel/...@140373

2009-03-18 17:39:46 -07:00

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

hardware

Add a new UEventObserver subclass to broadcast an Intent whe USB state changes.

2010-06-24 13:14:05 -04:00

inputmethodservice

merge from open-source master

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

net

Move the net transition wakelock to ConnService.

2010-06-16 11:04:37 -07:00

os

am b1efc3f6: am 7fbdc84e: More native input event dispatching.

2010-06-23 10:17:22 -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

Fix 2655246 file descriptor leak when accessing thumbnails

2010-06-23 11:32:40 -07:00

security

…

server

Changes for bluetooth keyboard support.

2010-06-21 16:23:42 -07:00

service

Native input dispatch rewrite work in progress.

2010-06-13 17:42:16 -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

Check for spanned before computing tab stops

2010-06-22 23:55:15 -07:00

util

am 599f7287: am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken

2010-06-08 12:40:57 -07:00

view

Merge "Add support for transformations."

2010-06-23 17:50:02 -07:00

webkit

Tweak fix for setXSSAuditorEnabled in LayoutTestController.

2010-06-23 14:11:37 -07:00

webruntime

Add a splash screen to the webruntime.

2010-06-24 18:45:34 +01:00

widget

Fixed bug 2795971 IME doesn't appear on touching a text field

2010-06-24 13:42:34 -07:00

package.html

auto import from //depot/cupcake/@135843

2009-03-03 19:31:44 -08:00