Dianne Hackborn e2c7715c77 resolved conflicts for merge of bbca8133 to master ...

Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6

2011-05-24 11:27:11 -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 bbca8133 to master

2011-05-24 11:27:11 -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 bbca8133 to master

2011-05-24 11:27:11 -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

Observe screen on/off events in NetworkPolicy.

2011-05-23 18:39:56 -07:00

nfc

Implement teardown script.

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

os

Merge "APIs to profile network usage for current UID."

2011-05-23 18:38:04 -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

Removing android.security.MessageDigest

2011-02-01 22:25:47 -08:00

server

am e2271a55: am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."

2011-05-21 21:35:16 -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

am d9435bce: am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework

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

webkit

am f55a00b1: am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.

2011-05-24 08:41:37 -07:00

widget

am 7dfdb914: am f483ed90: am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2

2011-05-23 17:18:54 -07:00

package.html

Update package descriptions with editorial revisions.

2011-01-26 14:58:19 -08:00