Adam Powell b9eab6c793 resolved conflicts for merge of 81cd2e90 to master ...

Fixed public.xml value padding for kraken/master

Merge commit '81cd2e90' into manualmerge

Conflicts:
	api/current.xml

Change-Id: I09d2c5c7e6acbf4086c0bb8756a5aaf41a646d71

2010-04-23 16:49:54 -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

resolved conflicts for merge of 81cd2e90 to master

2010-04-23 16:49:54 -07:00

appwidget

Add correct copyright headers to multiple files

2010-03-11 18:22:10 -08:00

bluetooth

Add an extra for the Disconnect Headset State.

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

content

resolved conflicts for merge of 81cd2e90 to master

2010-04-23 16:49:54 -07:00

database

fix a bug introduced when prepared-statement cache was made LRU-based

2010-04-23 11:32:57 -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 SCENE_MODE_BARCODE and FOCUS_MODE_EDOF.

2010-04-10 09:33:15 +08:00

inputmethodservice

merge from open-source master

2010-03-29 10:57:04 -07:00

net

Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo

2010-04-22 13:01:55 -07:00

os

am 52a28b25: am 6883c176: am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo

2010-04-09 08:53:03 -07:00

pim

vCard refactoring.

2010-04-21 16:06:09 +09:00

preference

Added MultiSelectListPreference

2010-04-15 10:18:17 -07:00

provider

am 13ec98f3: am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults

2010-04-13 16:29:12 -07:00

security

…

server

Fix runtime reboot when connecting to a A2DP headset and

2010-04-19 18:55:16 -07:00

service

Some debugging help for issue #2594388

2010-04-22 18:59:03 -07:00

speech

Unhiding TTS API constants and methods needed for TTS plugin support.

2010-04-02 13:39:53 -07:00

test

New test on ContextMenuInfo packed positions.

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

text

Refactor Styled utility functions into reusable objects.

2010-04-07 14:54:51 -07:00

util

relocate android.util.base64.* -> android.util.*

2010-03-29 13:46:47 -07:00

view

Attempt to fix the build.

2010-04-23 15:31:35 -05:00

webkit

If the user performed a very quick touch sequence without a response

2010-04-23 16:24:04 -07:00

widget

Fix a bug I introduced in CursorAdapter.

2010-04-22 11:26:06 -05:00

package.html

…