Jean-Baptiste Queru a4ddf42673 resolved conflicts for merge of c64b916e to master ...

Change-Id: I31b84d72186a918f19e0c9dee8fdebc83f661cc1

2010-08-24 10:45:16 -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

Adding animation facilities to simplify layout transitions

2010-08-23 13:01:06 -07:00

annotation

…

app

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

2010-08-21 09:44:53 -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 5474b0f8: am 39792d22: Fix bugs with granting permissions through onNewIntent().

2010-08-24 09:01:54 -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 f235a519: am ec58dff0: Fix build - remove dead doc link

2010-08-24 10:25:00 -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

resolved conflicts for merge of 485de781 to master

2010-08-24 09:57:33 -07:00

pim

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

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

preference

Merge "Make getListView() public and hidden, as it is needed for WifiSettings."

2010-08-18 10:42:39 -07:00

provider

Fixing the SDK build

2010-08-19 16:31:29 -07: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

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

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

util

am 2e47052f: am 567722ee: Merge "Fix problems with determining when to kill apps for wake usage." into gingerbread

2010-08-16 15:18:27 -07:00

view

Merge "Fix some issues with touch event splitting around event timing"

2010-08-23 18:20:56 -07:00

webkit

Hook up device sensors for DeviceOrientation

2010-08-24 16:33:46 +01:00

webruntime

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

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

widget

Merge conflict due to wrong import paths.

2010-08-23 12:09:14 -07:00

package.html

…