Jeff Brown 8e03b7566c resolved conflicts for merge of 9e660c82 to master ...

Change-Id: Ic4bd85cbaa5b9a10dcb474a0dad46490bf967e43

2010-06-13 19:16:55 -07:00

..

accessibilityservice

…

accounts

Add needsOtaServiceProvisioning to Phone.

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

annotation

…

app

Implement ListFragment and Fragment context menus.

2010-06-12 22:34:04 -07:00

appwidget

Call into app widget hosts when the provider is updated.

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

bluetooth

Serialize all commands for a particular profile.

2010-06-07 14:08:38 -07:00

content

resolved conflicts for merge of f3307ae8 to master

2010-06-04 14:09:02 -07:00

database

NPE in database corruption handler if attached database list is null

2010-06-10 17:40:01 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Change camera interface to support multiple cameras.

2010-06-11 16:47:33 +08:00

inputmethodservice

merge from open-source master

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

net

Make NetworkStateTracker an interface

2010-06-10 10:55:23 -07:00

os

resolved conflicts for merge of 9e660c82 to master

2010-06-13 19:16:55 -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

MTP: Add interface to MtpClient for receiving device added/removed events.

2010-06-12 21:35:27 -04:00

security

…

server

merge from froyo-plus-aosp

2010-06-09 16:09:19 -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

…

text

Move shaping to native.

2010-06-10 14:03:22 -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

resolved conflicts for merge of 9e660c82 to master

2010-06-13 19:16:55 -07:00

webkit

Finish refactoring zoom logic from WebView to ZoomManager.

2010-06-11 08:51:07 -04:00

widget

Move shaping to native.

2010-06-10 14:03:22 -07:00

package.html

…