Brad Fitzpatrick b1657b2bd6 resolved conflicts for merge of 64591009 to gingerbread-plus-aosp ...

Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e

2010-09-07 21:41:09 -07:00

..

accessibilityservice

…

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 64591009 to gingerbread-plus-aosp

2010-09-07 21:41:09 -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

am 6dc003a7: Merge "Reduce footprint of Signature from ~7000 to ~1448" into gingerbread

2010-09-03 17:07:15 -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

…

hardware

Quell annoying Java ascii/unicode warning.

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

inputmethodservice

Made text selection work in ExtractEditText. DO NOT MERGE

2010-09-07 18:07:30 -07:00

net

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

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

os

am 6e86915e: Merge "Fixes to battery stats debug output." into gingerbread

2010-09-07 14:15:17 -07:00

pim

Fix again.

2010-09-02 13:48:09 -07:00

preference

am a2f2141c: Merge "More SharedPreferences commit() -> apply() changes." into gingerbread

2010-09-03 12:49:44 -07:00

provider

am 042e9bd9: Add SIP related settings in the Settings.System.

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

security

…

server

am bb660d7e: Merge "Renaming SharedPreferences.startCommit to apply" into gingerbread

2010-08-30 18:18:54 -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

am 883bbb72: Merge "Hide mCursorController field in ArrowKeyMovementMethod." into gingerbread

2010-09-07 18:59:22 -07:00

util

Fixes to battery stats debug output.

2010-09-07 14:09:36 -07:00

view

DO NOT MERGE Tweak overscroll

2010-09-03 16:09:03 -07:00

webkit

am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread

2010-09-02 00:31:03 -07:00

widget

am dbd25cdb: Made text selection work in ExtractEditText. DO NOT MERGE

2010-09-07 18:59:10 -07:00

package.html

…