Jean-Baptiste Queru f4072fcc14 resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp ...

Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8

2010-11-17 16:47:59 -08:00

..

accessibilityservice

…

accounts

…

annotation

…

app

am 9df48a03: Merge "NotificationManager: droiddoc documentation improvements"

2010-11-02 15:00:06 -07:00

appwidget

…

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 b1fa549a: Merge "Fixes Issue 7907 in the public bugs database (http://code.google.com/p/android/issues/detail?id=7907)."

2010-11-01 10:39:01 -07:00

database

resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp

2010-11-17 16:47:59 -08:00

ddm

…

debug

…

emoji

…

gesture

…

hardware

Improve gyro and accelerometer java doc

2010-11-09 13:53:25 -08:00

inputmethodservice

Made paste work in ExtractEditText

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

net

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

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

nfc

Remove the My Tag feature.

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

os

am 383e95e2: Merge "DropBox: Read until the end of stream has been reached"

2010-11-16 09:37:56 -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

am 7ea5c45e: NFC settings cleanup.

2010-10-21 09:38:15 -07: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

…

test

…

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 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread

2010-11-10 08:25:02 -08:00

package.html

…