Dan Egnor 341ff13689 resolved conflicts for merge of 9bc4039a to gingerbread ...

Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec

2010-07-20 11:30:17 -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

Implement native key pre-dispatching to IMEs.

2010-07-15 22:05:33 -07:00

appwidget

Need to give the AppWidgetHostView the new info about the provider, in case the initialLayout

2010-06-23 17:44:30 -07:00

bluetooth

Serialize all commands for a particular profile.

2010-06-07 14:08:38 -07:00

content

Add API to call to vold for mounting OBBs

2010-07-15 21:31:58 -07:00

database

StrictMode: gather and return violating stacks in Binder replies

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

ddm

…

debug

…

emoji

…

gesture

…

hardware

resolved conflicts for merge of 9bc4039a to gingerbread

2010-07-20 11:30:17 -07:00

inputmethodservice

merge from open-source master

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

net

Merge "Interface support for custom HTTP headers in DL manager" into gingerbread

2010-07-15 12:24:14 -07:00

os

Add API to call to vold for mounting OBBs

2010-07-15 21:31:58 -07:00

pim

Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING.

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

preference

merge from open-source master

2010-05-19 08:28:32 -07:00

provider

fix javadoc error which breaks SDK build in gingerbread

2010-07-19 15:25:32 -07:00

security

…

server

fixed parsing issue in BluetoothService so that it parses the UUID property correctly

2010-07-19 10:03:13 -07:00

service

Add support for new input sources.

2010-07-15 18:32:33 -07:00

speech

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

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

test

…

text

merge from open-source master

2010-06-03 09:03:58 -07:00

util

Log.wtf when databases go to be downgraded.

2010-06-08 12:20:51 -07:00

view

Fix bug with phantom input windows.

2010-07-16 00:02:48 -07:00

webkit

Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.

2010-07-02 15:07:47 -07:00

widget

Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument.

2010-07-08 09:02:48 -05:00

package.html

…