Dianne Hackborn c8f8497b9c resolved conflicts for merge of 66d633d2 to master ...

Change-Id: I6c38d7c4d127954dfca17082215c587a3cd4a586

2010-08-25 23:14:44 -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

Fix for end events from Sequencer objects

2010-08-25 17:32:27 -07:00

annotation

…

app

resolved conflicts for merge of 66d633d2 to master

2010-08-25 23:14:44 -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 49209cbc: am d0e6598b: Merge "Start of SharedPreferences.startCommit()" into gingerbread

2010-08-25 16:40:06 -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 a62dfe9e: am 94e939e8: Merge "Improve Sensors documentation a bit" into gingerbread

2010-08-25 16:40:40 -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

MTP: work in progress on expanded property support

2010-08-25 18:42:22 -04: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

Fix for end events from Sequencer objects

2010-08-25 17:32:27 -07:00

util

Add facilities for layout transitions

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

view

resolved conflicts for merge of 66d633d2 to master

2010-08-25 23:14:44 -07:00

webkit

am d64f4a98: DO NOT MERGE fix null check

2010-08-25 13:53:05 -07:00

webruntime

Fix NPE in the webruntime after the splash screen has been dismissed.

2010-07-08 12:26:50 +01:00

widget

Cleanup and bug fixes in StackView

2010-08-25 13:16:14 -07:00

package.html

…