Dianne Hackborn 9b081a809a resolved conflicts for merge of 8b625a95 to master ...

Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba

2010-05-18 18:21:07 -07:00

..

accessibilityservice

…

accounts

am 2aa2f78e: am e8b1971c: Merge "allow null authtokens to invalidateAuthToken" into froyo

2010-04-01 14:37:34 -07:00

annotation

…

app

Add the Loader and supporting classes.

2010-05-18 00:07:15 -05:00

appwidget

Call into app widget hosts when the provider is updated.

2010-05-04 11:49:12 -07:00

bluetooth

Add an extra for the Disconnect Headset State.

2010-04-05 14:43:59 -07:00

content

Another try at fixing the docs build.

2010-05-18 11:11:57 -05:00

database

Remove the deprecated cursor methods.

2010-05-13 23:44:09 -05:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Add camera focus distances API.

2010-05-15 12:40:54 +08:00

inputmethodservice

merge from open-source master

2010-05-03 16:19:31 -07:00

net

am 7cd6ca9b: am d6e24ca2: am 4adacd23: merge from open-source master

2010-05-12 15:25:07 -07:00

os

am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API.

2010-05-17 15:08:48 -07:00

pim

Remove duplicate definition of flag.

2010-05-13 13:41:37 -07:00

preference

Revert "Merge "Raw types warnings removed.""

2010-05-03 18:51:28 -07:00

provider

Remove the deprecated cursor methods.

2010-05-13 23:44:09 -05:00

security

…

server

am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo

2010-05-04 18:30:47 -07:00

service

Add new API to take over a window's Surface.

2010-05-18 10:46:33 -07:00

speech

Fixing: RecognitionService logcat spam "cancel called..."

2010-05-04 20:53:52 +01:00

test

…

text

Add @hide tag to fix SDK build

2010-05-13 06:21:41 -07:00

util

Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt

2010-05-07 14:59:04 -07:00

view

resolved conflicts for merge of 8b625a95 to master

2010-05-18 18:21:07 -07:00

webkit

am 68cc7187: am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo

2010-05-18 09:12:37 -07:00

widget

am 5942ccf0: am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken

2010-05-17 14:58:44 -07:00

package.html

…