Jean-Baptiste Queru e78a000955 resolved conflicts for merge of 4b94c451 to stage-korg-master ...

Change-Id: I07b974f96ca598677e58623050e4668822e68f23

2010-12-13 13:06:13 -08:00

..

accessibilityservice

Fix for bug 2448479

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

accounts

am b37bca9e: Merge "COMMENT ONLY change to fix some formatting glitches and (more importantly) clarify issues surrounding removed accounts." into froyo

2010-08-06 18:55:05 -07:00

annotation

Add Annotation for optional features.

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

app

am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser"

2010-11-22 13:44:56 -08:00

appwidget

merge from open-source master

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

bluetooth

am 025f78eb: Merge "DO NOT MERGE Fix auto connection with headsets which don\'t send incoming connections for all profiles." into gingerbread

2010-10-27 23:44:02 -07:00

content

am 251384a7: Merge "Improve performance when getting styled string."

2010-11-19 10:25:09 -08:00

database

Fix build (broken documentation link)

2010-11-17 17:39:16 -08: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

Merge "Improve camera documentation." into gingerbread

2010-11-19 18:14:43 -08:00

inputmethodservice

Made paste work in ExtractEditText

2010-10-08 18:23:49 -07:00

net

am 1d67fa5b: Merge "Changing connect and response timeout."

2010-12-06 13:43:36 -08:00

nfc

Remove the My Tag feature.

2010-11-03 15:32:40 -05:00

os

resolved conflicts for merge of 4b94c451 to stage-korg-master

2010-12-13 13:06:13 -08:00

pim

Refrain warning when not appropriate. Do not merge

2010-10-04 07:59:34 -07:00

preference

am db65907a: Merge "Adding pan behavior on preference dialog."

2010-11-11 09:06:02 -08:00

provider

merge from gingerbread

2010-12-09 09:11:06 -08:00

security

…

server

am 8b525c07: Merge "Check for state before disconnecting." into gingerbread

2010-10-14 13:41:16 -07:00

service

Report the new size to wallpapers when the requested size changed.

2010-10-28 18:04:10 -07:00

speech

Fix NPE in TextToSpeech with setLanguage(null)

2010-07-26 16:11:58 -07:00

test

New test on ContextMenuInfo packed positions.

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

text

am 14a288da: Merge "Add suuport for splitting touch events across windows." into gingerbread

2010-09-27 12:37:03 -07:00

util

Add @Deprecated to match @deprecated where it's missing.

2010-11-09 10:10:11 -08:00

view

am 26153a33: Fix bug 3163052 - always use 32-bit drawing caches when destination window is 32-bit

2010-11-08 18:35:22 -08:00

webkit

am 28c74257: Add @Deprecated to match @deprecated where it\'s missing.

2010-11-09 10:17:33 -08:00

widget

am 864b1e00: Merge "NumberPicker: Set formatter local value to US."

2010-12-06 11:03:11 -08:00

package.html

…