Dianne Hackborn 161e67ff3b resolved conflicts for merge of 06a8ceac to master ...

Change-Id: Id51574c825affddfac14ad7214c5496d6a3d6e69

2011-05-19 21:44:52 -07:00

..

accessibilityservice

…

accounts

Tolerate missing AccountManager resource, not just missing resource name

2011-04-07 11:58:37 -07:00

animation

Minor javadoc enhancements

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

annotation

…

app

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

appwidget

Small change to AppWidgetProviderInfo public field name and docs

2011-02-28 14:53:09 -08:00

bluetooth

am 37677849: am 64c42cae: Rename HierarchicalStateMachine and HierarchicalState to StateMachine and State.

2011-04-18 15:28:47 -07:00

content

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

database

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

ddm

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

debug

…

emoji

…

gesture

Fix javadoc issues

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

hardware

resolved conflicts for merge of c1730dcf to master

2011-05-19 13:34:44 -04:00

inputmethodservice

Add initial API for stylus and mouse buttons.

2011-05-13 12:11:17 -07:00

net

am 09ded82b: am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE

2011-05-19 11:32:27 -07:00

nfc

Implement teardown script.

2011-04-01 14:41:18 -05:00

os

Merge c41aefe1

2011-05-19 07:54:53 -07:00

pim

Remove the deprecated things from Config.java. These haven't been working since before 1.0.

2011-04-07 19:23:05 -07:00

preference

Framework: fixed bug in multiselectlistpreference.

2011-04-22 16:41:10 -07:00

provider

Merge "Update Calendars table to v300"

2011-05-11 16:47:17 -07:00

security

…

server

Improve locking granularity for PAN and Input.

2011-05-17 15:10:00 -07:00

service/wallpaper

Rename ViewRoot to ViewAncestor.

2011-05-04 14:08:11 -07:00

speech

Pass synthesis request params through to the TTS service.

2011-05-17 09:47:59 +01:00

test

…

text

SuggestionSpans are preserved when picked.

2011-05-12 15:20:30 -07:00

util

resolved conflicts for merge of 05be6d6f to master

2011-05-09 19:00:59 -07:00

view

resolved conflicts for merge of 06a8ceac to master

2011-05-19 21:44:52 -07:00

webkit

Merge from honeycomb-plus-aosp

2011-05-12 17:23:41 -07:00

widget

expandGroup can now animate

2011-05-19 10:10:51 -07:00

package.html

…