Jean-Baptiste Queru 9eb7a72253 resolved conflicts for merge of f7fb5331 to kraken ...

Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20

2010-05-17 13:50:32 -07:00

..

accessibilityservice

Fix for bug 2448479

2010-02-17 16:46:42 -08:00

accounts

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

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

annotation

…

app

am 6d8e4fd8: am b83a283a: docs: add dev guide for backup

2010-05-14 11:56:14 -07: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

am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo

2010-05-12 19:10:01 -07:00

database

merge from open-source master

2010-05-13 09:04:45 -07:00

ddm

…

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

2010-02-17 10:04:39 -08:00

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

merge from open-source master

2010-05-12 14:53:25 -07:00

os

am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo

2010-05-11 10:23:56 -07:00

pim

Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING.

2010-05-10 16:11:21 -07:00

preference

Fix bug 2520540

2010-03-18 17:08:15 -07:00

provider

Expose _id in ExtendedProperties subValues

2010-04-29 14:50:37 -07:00

security

…

server

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

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

service

Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()

2010-04-27 15:55:30 -07:00

speech

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

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

test

New test on ContextMenuInfo packed positions.

2010-02-25 13:46:50 -08:00

text

Added WEB_URL_PATTERN for Montenegro ".me"

2010-05-05 18:20:48 -07:00

util

New xlarge screen size.

2010-04-28 16:51:52 -07:00

view

am b1110149: merge from open-source master

2010-05-13 14:56:02 -07:00

webkit

am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly.

2010-05-12 15:33:30 -07:00

widget

merge from open-source master

2010-05-17 08:56:54 -07:00

package.html

…