Jaikumar Ganesh fce9609a18 resolved conflicts for merge of 0de3cc9b to master ...

Change-Id: I9fcf892de6ebe90c6a4be19d02e3a009ddda89aa

2010-05-13 12:42:59 -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

Add Annotation for optional features.

2009-12-14 17:52:20 -08:00

app

ActionBar added to framework, integrated with Activity and styles.

2010-05-13 01:27:59 -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 0c6028c1: am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo

2010-05-12 19:12:53 -07:00

database

am fd5b040a: am 485b800e: am 1a3b3d48: merge from open-source master

2010-05-13 09:57:11 -07:00

ddm

Added dumpHprofDataDdms() call.

2010-01-29 13:29:51 -08:00

debug

…

emoji

…

gesture

Prevent possible NPE in android.gesture.Learner

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

hardware

Add continuous focus mode constant.

2010-05-10 15:14:56 +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 217f2686: am 7d5cea98: am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo

2010-05-11 10:28:20 -07:00

pim

resolved conflicts for merge of 0de3cc9b to master

2010-05-13 12:42:59 -07:00

preference

Revert "Merge "Raw types warnings removed.""

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

provider

Added access fields for second timezone columns.

2010-05-03 11:40:35 -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

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

ActionBar added to framework, integrated with Activity and styles.

2010-05-13 01:27:59 -07:00

webkit

am d4ef2973: am 2fb3b394: am bfc63c7b: 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

2010-05-12 15:39:26 -07:00

widget

Modify Canvas drawText to run bidi and shape.

2010-05-12 18:50:02 -07:00

package.html

…