Dianne Hackborn cf44040d93 resolved conflicts for merge of d3cd2596 to master ...

Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6

2010-08-24 17:47:42 -07:00

..

accessibilityservice

…

accounts

am 6f50a956: am 799f2bb0: am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 19:07:24 -07:00

animation

Add facilities for layout transitions

2010-08-24 13:09:20 -07:00

annotation

…

app

resolved conflicts for merge of d3cd2596 to master

2010-08-24 17:47:42 -07:00

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

2010-08-17 14:25:06 -07:00

bluetooth

am b13c9bc5: manual merge

2010-08-24 10:16:28 -07:00

content

am 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().

2010-08-24 09:01:54 -07:00

database

resolved conflicts for merge of c64b916e to master

2010-08-24 10:45:16 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am f235a519: am ec58dff0: Fix build - remove dead doc link

2010-08-24 10:25:00 -07:00

inputmethodservice

lock screen for xlarge

2010-08-13 15:08:05 -07:00

net

am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread

2010-08-20 12:04:07 -07:00

os

am 6cf1a8bf: am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread

2010-08-24 16:58:27 -07:00

pim

Fix vCard so that it looks at IM correctly.

2010-08-24 13:33:25 -07:00

preference

Merge "Make getListView() public and hidden, as it is needed for WifiSettings."

2010-08-18 10:42:39 -07:00

provider

Fixing the SDK build

2010-08-19 16:31:29 -07:00

security

…

server

Add BNEP_SVC UUID for incoming tethering connections.

2010-08-23 18:32:03 -07:00

service

Add support for new input sources.

2010-07-15 18:32:33 -07:00

speech

Fix NPE in TextToSpeech with setLanguage(null)

2010-07-26 16:11:58 -07:00

test

…

text

resolved conflicts for merge of 9765b2a0 to master

2010-08-24 15:14:12 -07:00

util

Add facilities for layout transitions

2010-08-24 13:09:20 -07:00

view

Merge "Use only one GL context per process, share chaches."

2010-08-24 17:20:20 -07:00

webkit

communicate drawing pause to webkit to pause gif animation

2010-08-24 15:36:08 -04:00

webruntime

…

widget

resolved conflicts for merge of 9765b2a0 to master

2010-08-24 15:14:12 -07:00

package.html

…