Gilles Debunne 252b36379f resolved conflicts for merge of a842d143 to master ...

Change-Id: I60bba17630d4a4aff5cb8ac9c8b81a2a1fddcd3b

2010-08-22 11:57:58 -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

multiple-property animations

2010-08-19 18:04:28 -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

bluetooth tethering

2010-08-18 15:07:50 -07:00

content

am bbe5fb2b: am 189de282: Merge "Fix for a Resource system bug that displayed the wrong name for missing asset." into gingerbread

2010-08-21 09:44:34 -07:00

database

New API and implementation of DB and memory-backed FDs

2010-08-18 15:39:52 +01:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

am 4195d097: am 8ad86fef: Merge "Improve documentation of getAltitude" into gingerbread

2010-08-20 06:27:37 -07:00

inputmethodservice

lock screen for xlarge

2010-08-13 15:08:05 -07:00

net

am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread

2010-08-18 15:14:31 -07:00

os

am 821afa9a: am 54d41379: Merge "Add OBB flags to support overlays" into gingerbread

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

Wait for bluetooth to turn on before Bluetooth Tethering is enabled

2010-08-20 15:12:22 -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

am 1f442104: am e0c8582e: Merge "Improve orientation sensing when waking up while flat." into gingerbread

2010-08-21 09:40:22 -07:00

webkit

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

webruntime

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

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

widget

resolved conflicts for merge of a842d143 to master

2010-08-22 11:57:58 -07:00

package.html

…