Jean-Baptiste Queru 0460e26a4c resolved conflicts for merge of 691be97f to gingerbread-plus-aosp ...

Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124

2010-08-20 17:16:37 -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

am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo

2010-08-19 17:40:10 -07:00

appwidget

…

bluetooth

manual merge

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

content

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

2010-08-20 11:53:29 -07:00

database

am 4d544376: am 86c035f0: Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo

2010-07-27 16:54:40 -07:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

resolved conflicts for merge of 691be97f to gingerbread-plus-aosp

2010-08-20 17:16:37 -07:00

inputmethodservice

…

net

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

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

os

am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread

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

pim

Make vCard importer/exporter aware of multi-byte parameters.

2010-08-17 16:40:47 -07:00

preference

…

provider

am b3e957bb: Merge "New download manager error code when we can\'t resume." into gingerbread

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

security

…

server

am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread

2010-07-19 13:50:49 -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 d018a0ce: Merge "Text selection without trackball." into gingerbread

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

util

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

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

view

Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread

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

webkit

am 581f7861: DO NOT MERGE Refactor find and select dialogs

2010-08-20 09:33:10 -07:00

widget

am d018a0ce: Merge "Text selection without trackball." into gingerbread

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

package.html

…