Brad Fitzpatrick 7f7ce40f90 resolved conflicts for merge of 28130bae to master ...

Change-Id: I13df8dc12092c3d2536e12216df9130d5914380a

2010-08-27 16:11:27 -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 Sequencer end events when terminated early

2010-08-27 08:36:59 -07:00

annotation

…

app

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

appwidget

Adding callback and fix to RemoteViewsFactory on notifyDataSetChanged.

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

bluetooth

Add @hide for the VENDOR_SPECIFIC_HEADSET_INTENT

2010-08-26 16:03:40 -07:00

content

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -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

Merge "Add NetworkProperties to DataConnection."

2010-08-27 11:38:48 -07:00

os

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

pim

Fix vCard so that it looks at IM correctly.

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

preference

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

provider

am b4298cd8: am 846eb30f: Add SipAddress to ContactsContract.

2010-08-27 12:14:13 -07:00

security

…

server

resolved conflicts for merge of 28130bae to master

2010-08-27 16:11:27 -07:00

service

Add support for new input sources.

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

speech

Updated documentation for upcoming fix for @code tags

2010-08-26 14:02:20 -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

am 4b4114d1: am a90b7f01: Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText() to return the selected text.

2010-08-27 12:14:46 -07:00

webkit

am c28bf25b: Merge "DO NOT MERGE copy selected text on tap" into gingerbread

2010-08-27 08:17:02 -07:00

webruntime

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

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

widget

Improve clipboard API.

2010-08-27 11:06:01 -07:00

package.html

…