Brad Fitzpatrick 28130baefb resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp ...

Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718

2010-08-27 12:08:40 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

accounts

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

2010-08-06 18:55:05 -07:00

annotation

…

app

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -07:00

appwidget

merge from open-source master

2010-07-12 15:26:21 -07:00

bluetooth

manual merge

2010-08-20 15:58:49 -07:00

content

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -07:00

database

resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp

2010-08-20 18:19:03 -07:00

ddm

…

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

hardware

Improve Sensors documentation a bit

2010-08-25 14:35:54 -07:00

inputmethodservice

merge from open-source master

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

net

resolved conflicts for merge of b998f311 to gingerbread-plus-aosp

2010-08-25 17:48:47 -07:00

os

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -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 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -07:00

provider

am 846eb30f: Add SipAddress to ContactsContract.

2010-08-26 14:52:10 -07:00

security

…

server

resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp

2010-08-27 12:08:40 -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

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.

2010-08-24 10:30:09 -07:00

util

Fix problems with determining when to kill apps for wake usage.

2010-08-15 17:27:29 -07:00

view

Add methods to InputConnection: setComposingRegion() to select a region of text for correction, and getSelectedText()

2010-08-26 14:53:39 -07:00

webkit

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

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

widget

am 225ad9cb: Merge "DO NOT MERGE Text selection: tapping on selection opens context menu" into gingerbread

2010-08-27 10:34:56 -07:00

package.html

…