Jeff Brown 08965fc730 resolved conflicts for merge of 4e14159a to master ...

Change-Id: I42dc1efc2218af326a826aeb16daded71722b363

2010-08-11 18:00:34 -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

Add new API to Animator to allow seeking of animations

2010-08-05 11:45:04 -07:00

annotation

…

app

ActionBar overlay mode, height fetching, show/hide

2010-08-11 16:17:57 -07:00

appwidget

Initial changes to allow collections in widgets.

2010-07-19 14:48:31 -07:00

bluetooth

am 4a671a74: am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread

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

content

am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

2010-08-11 00:50:56 -07:00

database

Add a few helpful APIs.

2010-08-10 10:13:18 -05:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

resolved conflicts for merge of dfce290b to master

2010-07-29 22:22:36 -07:00

inputmethodservice

Fix KeyboardView's verticalCorrection handling

2010-07-30 16:08:47 -07:00

net

Split WifiStateMachine from WifiStateTracker

2010-08-10 15:18:25 -07:00

os

am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread

2010-08-11 16:22:47 -07:00

pim

…

preference

add a Skip option

2010-08-11 15:45:01 -07:00

provider

MTP: Push queries for supported formats and properties up to Java.

2010-08-10 09:00:30 -04:00

security

…

server

Allow multiple HID devices to be connected.

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

Fix a bug where paragraph styles could leak onto an adjacent empty line.

2010-08-05 15:29:36 -07:00

util

Replace Bitmap's finalizers with PhantomReferences.

2010-08-09 09:44:40 -07:00

view

resolved conflicts for merge of 4e14159a to master

2010-08-11 18:00:34 -07:00

webkit

am dc1f0858: am 9902196f: Fix npe in getCacheTotalSize.

2010-08-11 07:21:25 -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 f00ee0f7 to master

2010-08-10 21:47:34 -07:00

package.html

…