Dianne Hackborn 39cf8c97c3 resolved conflicts for merge of ec85619f to master ...

Change-Id: Id820ddcb9d19341a1b383b3bef7659a2c0621cfa

2011-05-12 18:37:33 -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

am dda64e9a: am 51454295: am df9799f0: Fix build.

2011-05-12 17:42:14 -07:00

appwidget

…

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 0e59729b to master

2011-05-12 15:39:41 -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

…

hardware

Improve camera javadoc.

2011-05-05 14:36:28 +08:00

inputmethodservice

Fix key preview coordinates calculation

2011-04-20 16:09:12 +09:00

net

DO NOT MERGE Add DhcpStateMachine

2011-05-12 14:10:11 -07:00

nfc

Implement teardown script.

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

os

resolved conflicts for merge of ec85619f to master

2011-05-12 18:37:33 -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

Merge "Set service priority of A2DP and Headset from BluetoothService via IPC call"

2011-04-06 15:26:23 -07:00

service/wallpaper

Rename ViewRoot to ViewAncestor.

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

speech

Expose TTS engine API

2011-04-27 08:25:24 +01:00

test

…

text

Merge commit 'f395e304' into m

2011-05-02 10:25:55 -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 05be6d6f to master

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

webkit

Merge from honeycomb-plus-aosp

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

widget

Remove an unnecessary word from javadoc

2011-05-10 17:18:55 -07:00

package.html

…