Dianne Hackborn 711516d140 resolved conflicts for merge of 77fc8b80 to master ...

Change-Id: I014f9a886d6f05607d2a5d101ad2052a6841ee8d

2011-06-14 12:17:35 -07:00

..

accessibilityservice

Final polish of the interrogation feature.

2011-06-10 21:10:46 -07:00

accounts

…

animation

Add 'Property' object

2011-06-08 09:42:37 -07:00

annotation

…

app

Fix regression handling negative sizes.

2011-06-10 22:52:54 -07:00

appwidget

…

bluetooth

am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server"

2011-06-06 12:56:55 -07:00

content

resolved conflicts for merge of 77fc8b80 to master

2011-06-14 12:17:35 -07:00

database

Remove the obsolete function that is not used anymore

2011-06-01 20:40:50 -07:00

ddm

…

debug

…

emoji

…

gesture

Fix javadoc issues

2011-05-16 11:53:31 -07:00

hardware

Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast"

2011-06-08 09:42:54 -07:00

inputmethodservice

Handle action modes in the IME extract mode view.

2011-06-02 13:29:37 -07:00

net

Handle always present wired ethernet interfaces at boot.

2011-06-13 18:37:11 -07:00

nfc

Support for setting the NfcA transceive timeout (API).

2011-06-13 18:22:57 +02:00

os

resolved conflicts for merge of 77fc8b80 to master

2011-06-14 12:17:35 -07:00

pim

…

preference

Add SwitchPreference

2011-06-08 18:25:27 -07:00

provider

Merge "Fix commment"

2011-06-14 11:30:47 -07:00

server

am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread

2011-05-27 13:46:50 -07:00

service/wallpaper

Optimize orientation changes.

2011-06-10 18:13:30 -07:00

speech

Merge "A few TTS bug fixes"

2011-06-14 07:05:42 -07:00

test

…

text

am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2

2011-06-08 20:06:40 -07:00

util

Change Property.set() to throw UnsupportedOperationException by default

2011-06-10 10:07:59 -07:00

view

Merge "Allow touches to slide out of the navigation bar."

2011-06-13 20:30:09 -07:00

webkit

Merge "Fix thread violation in WebView.getViewHeight()"

2011-06-13 17:17:11 -07:00

widget

Merge "Switch is not affected by touch when disabled"

2011-06-13 17:09:12 -07:00

package.html

…