Dan Egnor 79102ad0f5 am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread ...

Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.

2010-07-20 13:58:57 -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

merge from open-source master

2010-07-20 10:25:37 -07:00

appwidget

merge from open-source master

2010-07-12 15:26:21 -07:00

bluetooth

Serialize all commands for a particular profile.

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

content

merge from open-source master

2010-07-16 14:01:37 -07:00

database

am 1772c34e: Merge "StrictMode: gather and return violating stacks in Binder replies" into gingerbread

2010-07-15 15:44:46 -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

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 from open-source master

2010-07-16 13:58:43 -07:00

os

merge from open-source master

2010-07-20 10:33:38 -07:00

pim

Add FLAG_RERAIN_PHONE_NUMBER_FORMATTING.

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

preference

Allow ListPreference summary to use entry

2010-07-13 10:28:44 -07:00

provider

merge from open-source master

2010-07-20 10:33:38 -07:00

security

…

server

am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread

2010-07-19 13:50:49 -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

New test on ContextMenuInfo packed positions.

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

text

Documentation Bug (Issue 9557)

2010-07-06 20:42:22 +02: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

am b29e3b9c: Merge "Change CursorTreeAdapter to close the cursors rather than deactivating them. Fix SimpleCursorTreeAdapter to allow a null cursor as an argument." into gingerbread

2010-07-08 11:52:01 -07:00

package.html

…