Robert Greenwalt d1c3ea6a21 resolved conflicts for merge of 3cd6a3e3 to master ...

Change-Id: If3e45cc3494b2c52a1f1dcc19deff763a50498d7

2010-05-26 10:37:48 -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

Fix 2673731: Adding support for password history to Device Admin.

2010-05-24 17:13:18 -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

am 6af002b7: am b32a74c7: am ee1cdd0e: merge from open-source master

2010-05-19 09:45:51 -07:00

database

sqlite crashes when closing the database

2010-05-21 15:41:58 -07:00

ddm

Added dumpHprofDataDdms() call.

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

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

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

hardware

Fix javadoc of camera focus distances API.

2010-05-20 16:33:51 +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

am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.

2010-05-17 15:08:48 -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

resolved conflicts for merge of 3cd6a3e3 to master

2010-05-26 10:37:48 -07: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

Add @hide tag to fix SDK build

2010-05-13 06:21:41 -07:00

util

Add KDDI/Softbank to available Shift_Jis mapping.

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

view

am 36893612: am d6ddcb7f: fix [2677468] some 3rd party GL ES apps get a 32-bits surface by default and fail

2010-05-24 19:13:52 -07:00

webkit

Refactoring more webview zoom code into ZoomManager.

2010-05-25 18:04:06 -04:00

widget

am 49551ca4: am 9a559970: am f67c874c: am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.

2010-05-24 16:30:16 -07:00

package.html

…