Brad Fitzpatrick b60c941811 resolved conflicts for merge of f37cbe6b to master ...

Change-Id: I529b17e55b9668f900f685f92e9831e14a82db05

2010-06-10 15:58:22 -07:00

..

accessibilityservice

…

accounts

Add needsOtaServiceProvisioning to Phone.

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

annotation

…

app

resolved conflicts for merge of f37cbe6b to master

2010-06-10 15:58:22 -07:00

appwidget

…

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

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

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add camera metering mode API.

2010-06-03 16:34:18 +08:00

inputmethodservice

…

net

Make NetworkStateTracker an interface

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

os

resolved conflicts for merge of f37cbe6b to master

2010-06-10 15:58: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

MTP: Add support for retrieving thumbnails to MTP content provider.

2010-06-10 16:58:03 -04:00

security

…

server

merge from froyo-plus-aosp

2010-06-09 16:09:19 -07:00

service

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

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

speech

…

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

Move OpenGL support out of ViewRoot into a new HardwareRenderer class.

2010-06-09 18:27:08 -07:00

webkit

resolved conflicts for merge of f37cbe6b to master

2010-06-10 15:58:22 -07:00

widget

Move shaping to native.

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

package.html

…